diff options
| author | Luke Dashjr <[email protected]> | 2016-01-15 05:17:15 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2016-01-15 05:17:15 +0000 |
| commit | 5bc4fb7b602c420be1c746442edad6b2d8e333ab (patch) | |
| tree | 32ce1458f7fafdf4f9a1dcb09091f1a6de416625 /src/test/pmt_tests.cpp | |
| parent | banlist (bugfix): allow CNode::SweepBanned() to run on interval (diff) | |
| parent | Merge pull request #7327 (diff) | |
| download | discoin-5bc4fb7b602c420be1c746442edad6b2d8e333ab.tar.xz discoin-5bc4fb7b602c420be1c746442edad6b2d8e333ab.zip | |
Merge branch 'master' into 20150703_banlist_updates
Diffstat (limited to 'src/test/pmt_tests.cpp')
| -rw-r--r-- | src/test/pmt_tests.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp index d9f3c3e46..113b9437e 100644 --- a/src/test/pmt_tests.cpp +++ b/src/test/pmt_tests.cpp @@ -1,7 +1,8 @@ -// Copyright (c) 2012-2013 The Bitcoin Core developers +// Copyright (c) 2012-2015 The Bitcoin Core developers // 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(); |