diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-12 17:50:26 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-12 17:50:26 +0200 |
| commit | fd4342097ab927851bb002327b305c75d7041532 (patch) | |
| tree | 2d4772cda21d1d75a9741fa2d1b4ff52c8548e6d | |
| parent | Merge pull request #1322 (diff) | |
| parent | tests: fix tests builds after fluffy blocks merge (diff) | |
| download | monero-fd4342097ab927851bb002327b305c75d7041532.tar.xz | |
Merge pull request #1325
2078cb6 tests: fix tests builds after fluffy blocks merge (moneromooo-monero)
| -rw-r--r-- | tests/core_proxy/core_proxy.h | 3 | ||||
| -rw-r--r-- | tests/unit_tests/ban.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h index a265ef1ce..31e876d06 100644 --- a/tests/core_proxy/core_proxy.h +++ b/tests/core_proxy/core_proxy.h @@ -89,5 +89,8 @@ namespace tests uint64_t get_target_blockchain_height() const { return 1; } size_t get_block_sync_size() 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::transaction& tx) const { return false; } + bool get_blocks(uint64_t start_offset, size_t count, std::list<cryptonote::block>& blocks, std::list<cryptonote::transaction>& txs) const { return false; } }; } diff --git a/tests/unit_tests/ban.cpp b/tests/unit_tests/ban.cpp index e82661545..6b3f029d1 100644 --- a/tests/unit_tests/ban.cpp +++ b/tests/unit_tests/ban.cpp @@ -64,6 +64,9 @@ public: uint64_t get_target_blockchain_height() const { return 1; } size_t get_block_sync_size() 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::transaction& tx) const { return false; } + bool get_blocks(uint64_t start_offset, size_t count, std::list<cryptonote::block>& blocks, std::list<cryptonote::transaction>& txs) const { return false; } }; typedef nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<test_core>> Server; |