diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:50:10 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:50:10 -0500 |
| commit | 10c6afd3167172628ac538c1efa5afe2127cd1d6 (patch) | |
| tree | 44963d677b21bd8f2b9a43dd0424daf95b83d1d1 /tests/core_proxy/core_proxy.cpp | |
| parent | 91083a43be8b6bbd3164369baad0baed21f2b05c (diff) | |
| parent | 81c384e408edef2eeced88ea1cf976720b6fed32 (diff) | |
| download | monzero-core-10c6afd3167172628ac538c1efa5afe2127cd1d6.tar.gz monzero-core-10c6afd3167172628ac538c1efa5afe2127cd1d6.tar.xz monzero-core-10c6afd3167172628ac538c1efa5afe2127cd1d6.zip | |
Merge pull request #1571
81c384e4 fix do_not_relay not preventing relaying on a timer (moneromooo-monero)
Diffstat (limited to 'tests/core_proxy/core_proxy.cpp')
| -rw-r--r-- | tests/core_proxy/core_proxy.cpp | 2 |
1 files changed, 1 insertions, 1 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; |