diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-12-26 21:25:05 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-12-26 21:25:18 -0800 |
| commit | b2221881a172f445ca2bb9e962033796d5cf70ac (patch) | |
| tree | ada4197cdb261e206d3efff6c6dd8daa2803f277 /tests | |
| parent | Merge pull request #7192 (diff) | |
| parent | Revert "Reject existing claimed blocks in sync mode" (diff) | |
| download | monero-b2221881a172f445ca2bb9e962033796d5cf70ac.tar.xz | |
Merge pull request #7199
025db3d2b Revert "Reject existing claimed blocks in sync mode" (luigi1111)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/core_proxy/core_proxy.h | 1 | ||||
| -rw-r--r-- | tests/unit_tests/node_server.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tests/core_proxy/core_proxy.h b/tests/core_proxy/core_proxy.h index ebc3a89c2..ecfcc18ae 100644 --- a/tests/core_proxy/core_proxy.h +++ b/tests/core_proxy/core_proxy.h @@ -112,6 +112,5 @@ namespace tests bool prune_blockchain(uint32_t pruning_seed) const { return true; } bool get_txpool_complement(const std::vector<crypto::hash> &hashes, std::vector<cryptonote::blobdata> &txes) { return false; } bool get_pool_transaction_hashes(std::vector<crypto::hash>& txs, bool include_unrelayed_txes = true) const { return false; } - crypto::hash get_block_id_by_height(uint64_t height) const { return crypto::null_hash; } }; } diff --git a/tests/unit_tests/node_server.cpp b/tests/unit_tests/node_server.cpp index 0569d3748..0191e5aa4 100644 --- a/tests/unit_tests/node_server.cpp +++ b/tests/unit_tests/node_server.cpp @@ -93,7 +93,6 @@ public: bool has_block_weights(uint64_t height, uint64_t nblocks) const { return false; } bool get_txpool_complement(const std::vector<crypto::hash> &hashes, std::vector<cryptonote::blobdata> &txes) { return false; } bool get_pool_transaction_hashes(std::vector<crypto::hash>& txs, bool include_unrelayed_txes = true) const { return false; } - crypto::hash get_block_id_by_height(uint64_t height) const { return crypto::null_hash; } void stop() {} }; |