diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-08-17 21:39:44 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-08-17 21:39:44 +0200 |
commit | 4466b6d1b08d827f3bdddb1cab8ca05833b65437 (patch) | |
tree | 3e86342c3194fddb5fac2b5f51b33bcf55ec887a /tests | |
parent | Merge pull request #2301 (diff) | |
parent | cryptonote_protocol: large block sync size before v4 (diff) | |
download | monero-4466b6d1b08d827f3bdddb1cab8ca05833b65437.tar.xz |
Merge pull request #2303
5a283078 cryptonote_protocol: large block sync size before v4 (moneromooo-monero)
7b747607 cryptonote_protocol: kick idle synchronizing peers (moneromooo-monero)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/core_proxy/core_proxy.h | 2 | ||||
-rw-r--r-- | tests/unit_tests/ban.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h index bd4b9f995..516d1f515 100644 --- a/tests/core_proxy/core_proxy.h +++ b/tests/core_proxy/core_proxy.h @@ -88,7 +88,7 @@ namespace tests bool prepare_handle_incoming_blocks(const std::list<cryptonote::block_complete_entry> &blocks) { return true; } bool cleanup_handle_incoming_blocks(bool force_sync = false) { return true; } uint64_t get_target_blockchain_height() const { return 1; } - size_t get_block_sync_size() const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; } + size_t get_block_sync_size(uint64_t height) const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; } virtual void on_transaction_relayed(const cryptonote::blobdata& tx) {} bool get_testnet() const { return false; } bool get_pool_transaction(const crypto::hash& id, cryptonote::blobdata& tx_blob) const { return false; } diff --git a/tests/unit_tests/ban.cpp b/tests/unit_tests/ban.cpp index 3783beab5..627e85348 100644 --- a/tests/unit_tests/ban.cpp +++ b/tests/unit_tests/ban.cpp @@ -65,7 +65,7 @@ public: bool prepare_handle_incoming_blocks(const std::list<cryptonote::block_complete_entry> &blocks) { return true; } bool cleanup_handle_incoming_blocks(bool force_sync = false) { return true; } uint64_t get_target_blockchain_height() const { return 1; } - size_t get_block_sync_size() const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; } + size_t get_block_sync_size(uint64_t height) const { return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; } virtual void on_transaction_relayed(const cryptonote::blobdata& tx) {} bool get_testnet() const { return false; } bool get_pool_transaction(const crypto::hash& id, cryptonote::blobdata& tx_blob) const { return false; } |