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/pmt_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/pmt_tests.cpp')
| -rw-r--r-- | src/test/pmt_tests.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp index d9f3c3e46..0d7fb2bc3 100644 --- a/src/test/pmt_tests.cpp +++ b/src/test/pmt_tests.cpp @@ -2,6 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "consensus/merkle.h" #include "merkleblock.h" #include "serialize.h" #include "streams.h" @@ -48,7 +49,7 @@ BOOST_AUTO_TEST_CASE(pmt_test1) } // calculate actual merkle root and height - uint256 merkleRoot1 = block.ComputeMerkleRoot(); + uint256 merkleRoot1 = BlockMerkleRoot(block); std::vector<uint256> vTxid(nTx, uint256()); for (unsigned int j=0; j<nTx; j++) vTxid[j] = block.vtx[j].GetHash(); |