aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-10-20 17:08:20 +0200
committerRiccardo Spagni <ric@spagni.net>2016-10-20 17:08:20 +0200
commit0b93dd39dbad9f29af6ea9f5800ced17b7c60ec9 (patch)
tree513edc93f9c2e561f72abc16ea12ce6c7e72b417
parentMerge pull request #1215 (diff)
parentunit_tests: fix build after get_output_histogram signature change (diff)
downloadmonero-0b93dd39dbad9f29af6ea9f5800ced17b7c60ec9.tar.xz
Merge pull request #1237
4fd56a5 unit_tests: fix build after get_output_histogram signature change (moneromooo-monero)
-rw-r--r--tests/unit_tests/hardfork.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit_tests/hardfork.cpp b/tests/unit_tests/hardfork.cpp
index b3bd47687..7b4874811 100644
--- a/tests/unit_tests/hardfork.cpp
+++ b/tests/unit_tests/hardfork.cpp
@@ -106,7 +106,7 @@ public:
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 is_read_only() const { return false; }
- virtual std::map<uint64_t, uint64_t> get_output_histogram(const std::vector<uint64_t> &amounts, bool unlocked) const { return std::map<uint64_t, uint64_t>(); }
+ 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>>(); }
virtual void add_block( const block& blk
, const size_t& block_size