diff options
author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-01-14 13:01:21 +0000 |
---|---|---|
committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-01-14 13:07:05 +0000 |
commit | 81c384e408edef2eeced88ea1cf976720b6fed32 (patch) | |
tree | 878d7c3bdd4410f99aa0eb4167d7d82a7ba7e816 /tests/core_proxy | |
parent | Merge pull request #1562 (diff) | |
download | monero-81c384e408edef2eeced88ea1cf976720b6fed32.tar.xz |
fix do_not_relay not preventing relaying on a timer
Also print its value when printing pool
Diffstat (limited to 'tests/core_proxy')
-rw-r--r-- | tests/core_proxy/core_proxy.cpp | 2 | ||||
-rw-r--r-- | tests/core_proxy/core_proxy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/core_proxy/core_proxy.cpp b/tests/core_proxy/core_proxy.cpp index 256faeccb..6202eea0d 100644 --- a/tests/core_proxy/core_proxy.cpp +++ b/tests/core_proxy/core_proxy.cpp @@ -165,7 +165,7 @@ string tx2str(const cryptonote::transaction& tx, const cryptonote::hash256& tx_h return ss.str(); }*/ -bool tests::proxy_core::handle_incoming_tx(const cryptonote::blobdata& tx_blob, cryptonote::tx_verification_context& tvc, bool keeped_by_block, bool relayed) { +bool tests::proxy_core::handle_incoming_tx(const cryptonote::blobdata& tx_blob, cryptonote::tx_verification_context& tvc, bool keeped_by_block, bool relayed, bool do_not_relay) { if (!keeped_by_block) return true; diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h index 31e876d06..bec9a83bb 100644 --- a/tests/core_proxy/core_proxy.h +++ b/tests/core_proxy/core_proxy.h @@ -74,7 +74,7 @@ namespace tests bool get_stat_info(cryptonote::core_stat_info& st_inf){return true;} bool have_block(const crypto::hash& id); bool get_blockchain_top(uint64_t& height, crypto::hash& top_id); - bool handle_incoming_tx(const cryptonote::blobdata& tx_blob, cryptonote::tx_verification_context& tvc, bool keeped_by_block, bool relaued); + bool handle_incoming_tx(const cryptonote::blobdata& tx_blob, cryptonote::tx_verification_context& tvc, bool keeped_by_block, bool relayed, bool do_not_relay); bool handle_incoming_block(const cryptonote::blobdata& block_blob, cryptonote::block_verification_context& bvc, bool update_miner_blocktemplate = true); void pause_mine(){} void resume_mine(){} |