diff options
author | Riccardo Spagni <ric@spagni.net> | 2015-11-21 13:04:56 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2015-11-21 13:05:01 +0200 |
commit | 830904ca4efeb49c87af246a975bc307e2d5f777 (patch) | |
tree | 70c92777fc82a486b459d89dac53bdfd4bbbc377 /tests/core_proxy/core_proxy.h | |
parent | Merge pull request #490 (diff) | |
parent | Relay transactions when they linger too long in the pool (diff) | |
download | monero-830904ca4efeb49c87af246a975bc307e2d5f777.tar.xz |
Merge pull request #492
932994c Relay transactions when they linger too long in the pool (moneromooo-monero)
Diffstat (limited to 'tests/core_proxy/core_proxy.h')
-rw-r--r-- | tests/core_proxy/core_proxy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h index 6b131e9eb..54025bbf5 100644 --- a/tests/core_proxy/core_proxy.h +++ b/tests/core_proxy/core_proxy.h @@ -75,7 +75,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 handle_incoming_tx(const cryptonote::blobdata& tx_blob, cryptonote::tx_verification_context& tvc, bool keeped_by_block, bool relaued); 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(){} |