diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2016-06-27 10:58:58 -0400 |
|---|---|---|
| committer | Suhas Daftuar <sdaftuar@gmail.com> | 2016-06-27 10:58:58 -0400 |
| commit | f15c2cde455174c7c899833fd5792460ed49a472 (patch) | |
| tree | 3e47de82db62ba2b0158efd0ec10b1318ad59463 /src/miner.h | |
| parent | 1922e5a6545835ac57e8a56aa4c4a251c07fe9e9 (diff) | |
| download | bitcoin-f15c2cde455174c7c899833fd5792460ed49a472.tar.xz | |
CreateNewBlock: add support for size-accounting to addPackageTxs
Includes a change to not continue to use size-accounting in addScoreTxs
or addPackageTxs just because addPriorityTxs() is used.
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.h b/src/miner.h index b303a8fa3c..bc4da63da0 100644 --- a/src/miner.h +++ b/src/miner.h @@ -193,7 +193,7 @@ private: /** Test if a new package would "fit" in the block */ bool TestPackage(uint64_t packageSize, int64_t packageSigOpsCost); /** Test if a set of transactions are all final */ - bool TestPackageFinality(const CTxMemPool::setEntries& package); + bool TestPackageFinalityAndSerializedSize(const CTxMemPool::setEntries& package); /** Return true if given transaction from mapTx has already been evaluated, * or if the transaction's cached data in mapTx is incorrect. */ bool SkipMapTxEntry(CTxMemPool::txiter it, indexed_modified_transaction_set &mapModifiedTx, CTxMemPool::setEntries &failedTx); |