diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-08-11 21:03:31 +0200 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-09-22 18:51:07 +0200 |
commit | 391dff16fe9ace90fc0f3308a5c63c453370e713 (patch) | |
tree | 3337a40ad6bca7c57560c45d091bb9ebfd6523cf /src/test/pmt_tests.cpp | |
parent | e59d2a80f9167031521d882394a08b02fa9d0343 (diff) | |
download | bitcoin-391dff16fe9ace90fc0f3308a5c63c453370e713.tar.xz |
Do not store Merkle branches in the wallet.
Assume that when a wallet transaction has a valid block hash and transaction position
in it, the transaction is actually there. We're already trusting wallet data in a
much more fundamental way anyway.
To prevent backward compatibility issues, a new record is used for storing the
block locator in the wallet. Old wallets will see a wallet file synchronized up
to the genesis block, and rescan automatically.
Diffstat (limited to 'src/test/pmt_tests.cpp')
-rw-r--r-- | src/test/pmt_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp index f6d06d6805..d9f3c3e467 100644 --- a/src/test/pmt_tests.cpp +++ b/src/test/pmt_tests.cpp @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(pmt_test1) } // calculate actual merkle root and height - uint256 merkleRoot1 = block.BuildMerkleTree(); + uint256 merkleRoot1 = block.ComputeMerkleRoot(); std::vector<uint256> vTxid(nTx, uint256()); for (unsigned int j=0; j<nTx; j++) vTxid[j] = block.vtx[j].GetHash(); |