Merge pull request #580

1813736 unit_tests: remove an unused variable (moneromooo-monero)
70dd346 unit_tests: fix hardfork test build (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-12-31 08:18:27 +02:00
commit be7a93f51f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -102,6 +102,7 @@ public:
virtual bool for_all_blocks(std::function<bool(uint64_t, const crypto::hash&, const cryptonote::block&)>) const { return true; } virtual bool for_all_blocks(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_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, size_t tx_idx)> f) const { return true; }
virtual bool is_read_only() const { return false; }
virtual void add_block( const block& blk virtual void add_block( const block& blk
, const size_t& block_size , const size_t& block_size
@ -282,7 +283,6 @@ TEST(reorganize, Same)
TEST(reorganize, Changed) TEST(reorganize, Changed)
{ {
int history = 4;
TestDB db; TestDB db;
HardFork hf(db, 1, 0, 1, 1, 4, 100); HardFork hf(db, 1, 0, 1, 1, 4, 100);