diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-27 15:51:57 +1000 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-11-04 11:27:02 +1000 |
| commit | 319b11607f8592d7ef67ec82fa73545ad7430974 (patch) | |
| tree | 35a62a9d0df1c0bb9157e8cc85ab086c01c55217 /src/miner.cpp | |
| parent | 39b4f0d7ddc964b789876d15d888c3b29022939e (diff) | |
| download | bitcoin-319b11607f8592d7ef67ec82fa73545ad7430974.tar.xz | |
Refactor: CTxMempool class to its own txmempool.{cpp,h}
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 dca8609e17..b03f915dc9 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; |