diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-04-07 17:56:18 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-04-07 17:56:18 -0400 |
| commit | a8bc7182eaa39d8be61f5e2ed9d98184e5820f17 (patch) | |
| tree | 08c5e2f911d2726662470dae48c53f5c17aa1e50 /src/cryptonote_core/tx_pool.cpp | |
| parent | updated unbound cmake for static builds (diff) | |
| parent | Merges PR #37 (diff) | |
| download | monero-a8bc7182eaa39d8be61f5e2ed9d98184e5820f17.tar.xz | |
Merge BlockchainDB into upstream
Diffstat (limited to 'src/cryptonote_core/tx_pool.cpp')
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 691d16492..03ced2c2e 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -37,7 +37,11 @@ #include "cryptonote_format_utils.h" #include "cryptonote_boost_serialization.h" #include "cryptonote_config.h" +#if BLOCKCHAIN_DB == DB_LMDB +#include "blockchain.h" +#else #include "blockchain_storage.h" +#endif #include "common/boost_serialization_helper.h" #include "common/int-util.h" #include "misc_language.h" @@ -52,12 +56,19 @@ namespace cryptonote { size_t const TRANSACTION_SIZE_LIMIT = (((CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125) / 100) - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE); } - //--------------------------------------------------------------------------------- +#if BLOCKCHAIN_DB == DB_LMDB + //--------------------------------------------------------------------------------- + tx_memory_pool::tx_memory_pool(Blockchain& bchs): m_blockchain(bchs) + { + + } +#else tx_memory_pool::tx_memory_pool(blockchain_storage& bchs): m_blockchain(bchs) { } +#endif //--------------------------------------------------------------------------------- bool tx_memory_pool::add_tx(const transaction &tx, /*const crypto::hash& tx_prefix_hash,*/ const crypto::hash &id, size_t blob_size, tx_verification_context& tvc, bool kept_by_block) { |