diff options
| author | Pieter Wuille <[email protected]> | 2015-12-01 20:26:17 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2015-12-01 20:30:54 +0100 |
| commit | 4077ad20d03f0ef61d48ef34b3107661b0ff8ffe (patch) | |
| tree | 0cf289e53969878180a50a36cb264e084b0179f6 /src/test/test_bitcoin.cpp | |
| parent | Merge pull request #7137 (diff) | |
| parent | Rewrite CreateNewBlock (diff) | |
| download | discoin-4077ad20d03f0ef61d48ef34b3107661b0ff8ffe.tar.xz discoin-4077ad20d03f0ef61d48ef34b3107661b0ff8ffe.zip | |
Merge pull request #6898
553cad9 Rewrite CreateNewBlock (Alex Morcos)
5f12263 Expose FormatStateMessage (Alex Morcos)
1f09287 Make accessing mempool parents and children public (Alex Morcos)
7230187 Add TxPriority class and comparator (Alex Morcos)
f3fe836 Add a score index to the mempool. (Alex Morcos)
c49d5bc Store the total sig op count of a tx. (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 9645c7c94..2147dbb06 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -150,7 +150,7 @@ CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(CMutableTransaction &tx, CTxMemPo CAmount inChainValue = hasNoDependencies ? txn.GetValueOut() : 0; return CTxMemPoolEntry(txn, nFee, nTime, dPriority, nHeight, - hasNoDependencies, inChainValue, spendsCoinbase); + hasNoDependencies, inChainValue, spendsCoinbase, sigOpCount); } void Shutdown(void* parg) |