diff options
| author | Gavin Andresen <[email protected]> | 2013-11-03 20:07:36 -0800 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-11-03 20:07:36 -0800 |
| commit | a95a1c06b1823d13e8b685c6b18696ead1d17422 (patch) | |
| tree | 35a62a9d0df1c0bb9157e8cc85ab086c01c55217 /src/miner.cpp | |
| parent | Merge pull request #3193 from joshtriplett/patch-1 (diff) | |
| parent | Refactor: CTxMempool class to its own txmempool.{cpp,h} (diff) | |
| download | discoin-a95a1c06b1823d13e8b685c6b18696ead1d17422.tar.xz discoin-a95a1c06b1823d13e8b685c6b18696ead1d17422.zip | |
Merge pull request #3154 from gavinandresen/mempool_refactor
Mempool refactor
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index dca8609e1..b03f915dc 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -521,7 +521,7 @@ void static BitcoinMiner(CWallet *pwallet) // // Create new block // - unsigned int nTransactionsUpdatedLast = nTransactionsUpdated; + unsigned int nTransactionsUpdatedLast = mempool.GetTransactionsUpdated(); CBlockIndex* pindexPrev = chainActive.Tip(); auto_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey)); @@ -623,7 +623,7 @@ void static BitcoinMiner(CWallet *pwallet) break; if (nBlockNonce >= 0xffff0000) break; - if (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60) + if (mempool.GetTransactionsUpdated() != nTransactionsUpdatedLast && GetTime() - nStart > 60) break; if (pindexPrev != chainActive.Tip()) break; |