diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-06-13 11:27:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-06-13 11:35:55 +0200 |
| commit | e1486eb95c50834179d42e3d056e11c2f7b4ebff (patch) | |
| tree | 68a23a67e6ee2a7075548fc61b87b93a18530bf5 /src/test/test_bitcoin.cpp | |
| parent | Merge #8193: [trivial][doc] Use Debian 8.5 in the gitian-build guide (diff) | |
| parent | FIX: correctly measure size of priority block (diff) | |
| download | discoin-e1486eb95c50834179d42e3d056e11c2f7b4ebff.tar.xz discoin-e1486eb95c50834179d42e3d056e11c2f7b4ebff.zip | |
Merge #7598: Refactor CreateNewBlock to be a method of the BlockAssembler class
c2dd5a3 FIX: correctly measure size of priority block (Alex Morcos)
a278764 FIX: Account for txs already added to block in addPriorityTxs (Alex Morcos)
4dc94d1 Refactor CreateNewBlock to be a method of the BlockAssembler class (Alex Morcos)
Diffstat (limited to 'src/test/test_bitcoin.cpp')
| -rw-r--r-- | src/test/test_bitcoin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 9bcb07626..c68320ba8 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -98,7 +98,7 @@ CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey) { const CChainParams& chainparams = Params(); - CBlockTemplate *pblocktemplate = CreateNewBlock(chainparams, scriptPubKey); + CBlockTemplate *pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey); CBlock& block = pblocktemplate->block; // Replace mempool-selected txns with just coinbase plus passed-in txns: |