diff options
| author | Max K <[email protected]> | 2017-12-28 22:41:29 +0100 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2018-09-19 19:24:06 +0100 |
| commit | 60f8ff05e429556f13570b72e9c9b25197199354 (patch) | |
| tree | 61587c356773267f523f312564b4fbf2bb5dba75 /src/test/blockencodings_tests.cpp | |
| parent | Modify chain consensus parameters to be height aware (#1396) (diff) | |
| download | discoin-60f8ff05e429556f13570b72e9c9b25197199354.tar.xz discoin-60f8ff05e429556f13570b72e9c9b25197199354.zip | |
Fix 1.14 unit tests (#1408)
* Fix BlockEncodings test by setting a legacy block version
* Fix RPC test by adding missing RPC call
* Add missing regtest genesis hashes
Diffstat (limited to 'src/test/blockencodings_tests.cpp')
| -rw-r--r-- | src/test/blockencodings_tests.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp index 8d5323532..6d8e59bc4 100644 --- a/src/test/blockencodings_tests.cpp +++ b/src/test/blockencodings_tests.cpp @@ -29,7 +29,7 @@ static CBlock BuildBlockTestCase() { block.vtx.resize(3); block.vtx[0] = MakeTransactionRef(tx); - block.nVersion = 42; + block.nVersion = 1; block.hashPrevBlock = GetRandHash(); block.nBits = 0x207fffff; @@ -103,7 +103,6 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest) BOOST_CHECK(block.hashMerkleRoot != BlockMerkleRoot(block2, &mutated)); CBlock block3; - // FIXME: Somehow this seems to be broken by adding chain ID to RegTest BOOST_CHECK(partialBlock.FillBlock(block3, {block.vtx[1]}) == READ_STATUS_OK); BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString()); BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString()); @@ -207,7 +206,6 @@ BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest) CBlock block3; PartiallyDownloadedBlock partialBlockCopy = partialBlock; - // FIXME: Somehow this seems to be broken by adding chain ID to RegTest BOOST_CHECK(partialBlock.FillBlock(block3, {block.vtx[0]}) == READ_STATUS_OK); BOOST_CHECK_EQUAL(block.GetHash().ToString(), block3.GetHash().ToString()); BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block3, &mutated).ToString()); @@ -258,7 +256,6 @@ BOOST_AUTO_TEST_CASE(SufficientPreforwardRTTest) CBlock block2; PartiallyDownloadedBlock partialBlockCopy = partialBlock; - // FIXME: Somehow this seems to be broken by adding chain ID to RegTest BOOST_CHECK(partialBlock.FillBlock(block2, {}) == READ_STATUS_OK); BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString()); bool mutated; @@ -285,7 +282,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest) CBlock block; block.vtx.resize(1); block.vtx[0] = MakeTransactionRef(std::move(coinbase)); - block.nVersion = 42; + block.nVersion = 1; block.hashPrevBlock = GetRandHash(); block.nBits = 0x207fffff; @@ -310,7 +307,6 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest) CBlock block2; std::vector<CTransactionRef> vtx_missing; - // FIXME: Somehow this seems to be broken by adding chain ID to RegTest BOOST_CHECK(partialBlock.FillBlock(block2, vtx_missing) == READ_STATUS_OK); BOOST_CHECK_EQUAL(block.GetHash().ToString(), block2.GetHash().ToString()); BOOST_CHECK_EQUAL(block.hashMerkleRoot.ToString(), BlockMerkleRoot(block2, &mutated).ToString()); |