diff options
| author | Jeff Garzik <[email protected]> | 2014-12-31 06:48:42 -0500 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2014-12-31 06:48:42 -0500 |
| commit | aa5c0d34b7f4c10576914f1d07e1b823fd2f2c4b (patch) | |
| tree | 98885c7b8b0ac6d65c77b174248b9cb5cc33cc14 /src/txmempool.cpp | |
| parent | Merge pull request #5499 (diff) | |
| parent | Move UndoWriteToDisk() and UndoReadFromDisk() to anon namespace (diff) | |
| download | discoin-aa5c0d34b7f4c10576914f1d07e1b823fd2f2c4b.tar.xz discoin-aa5c0d34b7f4c10576914f1d07e1b823fd2f2c4b.zip | |
Merge #5111 from
branch 'core2' of git://github.com/jtimon/bitcoin into merge-5111
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 3071ab025..01bf1ec08 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -585,9 +585,9 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const if (fDependsWait) waitingOnDependants.push_back(&it->second); else { - CValidationState state; CTxUndo undo; + CValidationState state; assert(CheckInputs(tx, state, mempoolDuplicate, false, 0, false, NULL)); - UpdateCoins(tx, state, mempoolDuplicate, undo, 1000000); + UpdateCoins(tx, state, mempoolDuplicate, 1000000); } } unsigned int stepsSinceLastRemove = 0; @@ -601,8 +601,7 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const assert(stepsSinceLastRemove < waitingOnDependants.size()); } else { assert(CheckInputs(entry->GetTx(), state, mempoolDuplicate, false, 0, false, NULL)); - CTxUndo undo; - UpdateCoins(entry->GetTx(), state, mempoolDuplicate, undo, 1000000); + UpdateCoins(entry->GetTx(), state, mempoolDuplicate, 1000000); stepsSinceLastRemove = 0; } } |