diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-11-21 10:51:32 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-11-21 10:51:37 +0100 |
| commit | 7490ae8b699d2955b665cf849d86ff5bb5245c28 (patch) | |
| tree | 31f4d8edd5134e92bf133ee3dfd52651c14ed21e /src/test/pmt_tests.cpp | |
| parent | Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks (diff) | |
| parent | Introduce convenience type CTransactionRef (diff) | |
| download | discoin-7490ae8b699d2955b665cf849d86ff5bb5245c28.tar.xz discoin-7490ae8b699d2955b665cf849d86ff5bb5245c28.zip | |
Merge #9125: Make CBlock a vector of shared_ptr of CTransactions
b4e4ba4 Introduce convenience type CTransactionRef (Pieter Wuille)
1662b43 Make CBlock::vtx a vector of shared_ptr<CTransaction> (Pieter Wuille)
da60506 Add deserializing constructors to CTransaction and CMutableTransaction (Pieter Wuille)
0e85204 Add serialization for unique_ptr and shared_ptr (Pieter Wuille)
Diffstat (limited to 'src/test/pmt_tests.cpp')
| -rw-r--r-- | src/test/pmt_tests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp index c77312964..e6b689bc6 100644 --- a/src/test/pmt_tests.cpp +++ b/src/test/pmt_tests.cpp @@ -45,14 +45,14 @@ BOOST_AUTO_TEST_CASE(pmt_test1) for (unsigned int j=0; j<nTx; j++) { CMutableTransaction tx; tx.nLockTime = j; // actual transaction data doesn't matter; just make the nLockTime's unique - block.vtx.push_back(CTransaction(tx)); + block.vtx.push_back(MakeTransactionRef(std::move(tx))); } // calculate actual merkle root and height uint256 merkleRoot1 = BlockMerkleRoot(block); std::vector<uint256> vTxid(nTx, uint256()); for (unsigned int j=0; j<nTx; j++) - vTxid[j] = block.vtx[j].GetHash(); + vTxid[j] = block.vtx[j]->GetHash(); int nHeight = 1, nTx_ = nTx; while (nTx_ > 1) { nTx_ = (nTx_+1)/2; |