diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-09-23 19:34:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-09-23 19:37:51 +0200 |
| commit | 5b77244c60f3137647fed1c9510965d48992ccbe (patch) | |
| tree | 743e4e2151f1e970ca9b44e8f39e57456ec80d7b /src/test/miner_tests.cpp | |
| parent | Merge pull request #6653 (diff) | |
| parent | Avoid duplicate CheckBlock checks (diff) | |
| download | discoin-5b77244c60f3137647fed1c9510965d48992ccbe.tar.xz discoin-5b77244c60f3137647fed1c9510965d48992ccbe.zip | |
Merge pull request #6550
3b33ec8 Avoid duplicate CheckBlock checks (Pieter Wuille)
391dff1 Do not store Merkle branches in the wallet. (Pieter Wuille)
Diffstat (limited to 'src/test/miner_tests.cpp')
| -rw-r--r-- | src/test/miner_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index ad79a558c..91a3a5738 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -87,7 +87,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->BuildMerkleTree(); + pblock->hashMerkleRoot = pblock->ComputeMerkleRoot(); pblock->nNonce = blockinfo[i].nonce; CValidationState state; BOOST_CHECK(ProcessNewBlock(state, NULL, pblock, true, NULL)); |