diff options
| author | Thomas Winget <tewinget@gmail.com> | 2014-09-24 23:50:51 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2014-09-24 23:50:51 -0400 |
| commit | 145dc19eebd2c9f289381debfa1fb7a4b8c71ef7 (patch) | |
| tree | c511ed7ecb8b3bdd2da26e55801d20f6326f656a /src/cryptonote_core/tx_pool.cpp | |
| parent | Merge pull request #159 (diff) | |
| parent | Remove LDNS dep and fix a bug in libunbound const correctness fix (diff) | |
| download | monero-145dc19eebd2c9f289381debfa1fb7a4b8c71ef7.tar.xz | |
Merge pull request #160 from tewinget/remove_ldns_dep
Remove ldns dependency
Diffstat (limited to 'src/cryptonote_core/tx_pool.cpp')
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 81f932014..3764cfe77 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -59,9 +59,9 @@ namespace cryptonote } //--------------------------------------------------------------------------------- - 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) + bool tx_memory_pool::add_tx(const transaction &tx, const crypto::hash &id, tx_verification_context& tvc, bool kept_by_block) { - + size_t blob_size = get_object_blobsize(tx); if(!check_inputs_types_supported(tx)) { @@ -179,9 +179,8 @@ namespace cryptonote bool tx_memory_pool::add_tx(const transaction &tx, tx_verification_context& tvc, bool keeped_by_block) { crypto::hash h = null_hash; - size_t blob_size = 0; - get_transaction_hash(tx, h, blob_size); - return add_tx(tx, h, blob_size, tvc, keeped_by_block); + get_transaction_hash(tx, h); + return add_tx(tx, h, tvc, keeped_by_block); } //--------------------------------------------------------------------------------- bool tx_memory_pool::remove_transaction_keyimages(const transaction& tx) |