diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-10-26 17:53:49 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-10-26 17:53:52 +0200 |
| commit | 33e7d4b35c0e6159934e6cde62bd5c86973791e5 (patch) | |
| tree | 687f1d48cd6e6dcba3b6c3445b5ddabecdf89a6f /tests | |
| parent | Merge pull request #437 (diff) | |
| parent | hardfork: switch voting to block minor version (diff) | |
| download | monero-33e7d4b35c0e6159934e6cde62bd5c86973791e5.tar.xz | |
Merge pull request #438
6376627 hardfork: switch voting to block minor version (moneromooo-monero)
55178ae unit_tests: remove leftover debug traces in hardfork test (moneromooo-monero)
Diffstat (limited to '')
| -rw-r--r-- | tests/unit_tests/hardfork.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/unit_tests/hardfork.cpp b/tests/unit_tests/hardfork.cpp index 25d03b703..210c1959b 100644 --- a/tests/unit_tests/hardfork.cpp +++ b/tests/unit_tests/hardfork.cpp @@ -116,11 +116,9 @@ public: return starting_height[version]; } virtual void set_hard_fork_version(uint64_t height, uint8_t version) { - printf("set_hard_fork_version(%lu, %u)\n", (unsigned long)height, version); if (versions.size() <= height) versions.resize(height+1); versions[height] = version; } virtual uint8_t get_hard_fork_version(uint64_t height) const { - printf("get_hard_fork_version(%lu)\n", (unsigned long)height); return versions[height]; } @@ -133,7 +131,7 @@ private: static cryptonote::block mkblock(uint8_t version) { cryptonote::block b; - b.major_version = version; + b.minor_version = version; return b; } @@ -360,7 +358,6 @@ TEST(new_blocks, denied) ASSERT_TRUE(hf.add(2, 2, 1)); hf.init(); - ASSERT_FALSE(hf.add(mkblock(0), 0)); ASSERT_TRUE(hf.add(mkblock(1), 0)); ASSERT_TRUE(hf.add(mkblock(1), 1)); ASSERT_TRUE(hf.add(mkblock(1), 2)); @@ -386,7 +383,6 @@ TEST(new_version, early) ASSERT_TRUE(hf.add(2, 4, 1)); hf.init(); - ASSERT_FALSE(hf.add(mkblock(0), 0)); ASSERT_TRUE(hf.add(mkblock(2), 0)); ASSERT_TRUE(hf.add(mkblock(2), 1)); // we have enough votes already ASSERT_TRUE(hf.add(mkblock(2), 2)); @@ -419,7 +415,6 @@ TEST(reorganize, changed) #define ADD_TRUE(v, h) ADD(v, h, TRUE) #define ADD_FALSE(v, h) ADD(v, h, FALSE) - ADD_FALSE(0, 0); ADD_TRUE(1, 0); ADD_TRUE(1, 1); ADD_TRUE(2, 2); |