diff options
| author | Pieter Wuille <[email protected]> | 2015-11-28 22:24:10 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2015-11-28 22:27:38 +0100 |
| commit | 61457c29d735b77182b5fbd45e86d7e3db343857 (patch) | |
| tree | 12ef26e009f3bab19c7b4d9f8e643db2ccd8a5f0 /src/test/miner_tests.cpp | |
| parent | Merge pull request #6961 (diff) | |
| parent | Switch blocks to a constant-space Merkle root/branch algorithm. (diff) | |
| download | discoin-61457c29d735b77182b5fbd45e86d7e3db343857.tar.xz discoin-61457c29d735b77182b5fbd45e86d7e3db343857.zip | |
Merge pull request #6508
eece63f Switch blocks to a constant-space Merkle root/branch algorithm. (Pieter Wuille)
ee60e56 Add merkle.{h,cpp}, generic merkle root/branch algorithm (Pieter Wuille)
Diffstat (limited to 'src/test/miner_tests.cpp')
| -rw-r--r-- | src/test/miner_tests.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index dc20e3463..1d7c9f65c 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -5,6 +5,7 @@ #include "chainparams.h" #include "coins.h" #include "consensus/consensus.h" +#include "consensus/merkle.h" #include "consensus/validation.h" #include "main.h" #include "miner.h" @@ -93,7 +94,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) pblock->vtx[0] = CTransaction(txCoinbase); if (txFirst.size() < 2) txFirst.push_back(new CTransaction(pblock->vtx[0])); - pblock->hashMerkleRoot = pblock->ComputeMerkleRoot(); + pblock->hashMerkleRoot = BlockMerkleRoot(*pblock); pblock->nNonce = blockinfo[i].nonce; CValidationState state; BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL)); |