diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/hash/main.cpp | 2 | ||||
-rw-r--r-- | tests/unit_tests/hardfork.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/hash/main.cpp b/tests/hash/main.cpp index c7e1fe712..cc5b9ba66 100644 --- a/tests/hash/main.cpp +++ b/tests/hash/main.cpp @@ -49,7 +49,7 @@ extern "C" { if ((length & 31) != 0) { throw ios_base::failure("Invalid input length for tree_hash"); } - tree_hash((const char (*)[32]) data, length >> 5, hash); + tree_hash((const char (*)[crypto::HASH_SIZE]) data, length >> 5, hash); } static void cn_slow_hash_0(const void *data, size_t length, char *hash) { return cn_slow_hash(data, length, hash, 0/*variant*/, 0/*prehashed*/); diff --git a/tests/unit_tests/hardfork.cpp b/tests/unit_tests/hardfork.cpp index a2038ff0c..3e2199217 100644 --- a/tests/unit_tests/hardfork.cpp +++ b/tests/unit_tests/hardfork.cpp @@ -109,7 +109,8 @@ public: virtual bool for_all_key_images(std::function<bool(const crypto::key_image&)>) const { return true; } virtual bool for_blocks_range(const uint64_t&, const uint64_t&, std::function<bool(uint64_t, const crypto::hash&, const cryptonote::block&)>) const { return true; } virtual bool for_all_transactions(std::function<bool(const crypto::hash&, const cryptonote::transaction&)>) const { return true; } - virtual bool for_all_outputs(std::function<bool(uint64_t amount, const crypto::hash &tx_hash, size_t tx_idx)> f) const { return true; } + virtual bool for_all_outputs(std::function<bool(uint64_t amount, const crypto::hash &tx_hash, uint64_t height, size_t tx_idx)> f) const { return true; } + virtual bool for_all_outputs(uint64_t amount, const std::function<bool(uint64_t height)> &f) const { return true; } virtual bool is_read_only() const { return false; } virtual std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>> get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked, uint64_t recent_cutoff) const { return std::map<uint64_t, std::tuple<uint64_t, uint64_t, uint64_t>>(); } |