aboutsummaryrefslogtreecommitdiff
path: root/src/miner.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2014-05-07 17:10:35 +0200
committerPieter Wuille <pieter.wuille@gmail.com>2014-06-09 02:21:15 +0200
commit18e72167ddfeaea95253b62994c6d64b55b35005 (patch)
tree9ddc6e0b6866df01124b48355bb65deb1fa55411 /src/miner.cpp
parent202e01941c087e0b06a7c18ce344a53ce94e1350 (diff)
downloadbitcoin-18e72167ddfeaea95253b62994c6d64b55b35005.tar.xz
Push cs_mains down in ProcessBlock
Diffstat (limited to 'src/miner.cpp')
-rw-r--r--src/miner.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/miner.cpp b/src/miner.cpp
index ddd277a9bb..baaa22c8f3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -484,22 +484,22 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
LOCK(cs_main);
if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash())
return error("BitcoinMiner : generated block is stale");
+ }
- // Remove key from key pool
- reservekey.KeepKey();
-
- // Track how many getdata requests this block gets
- {
- LOCK(wallet.cs_wallet);
- wallet.mapRequestCount[pblock->GetHash()] = 0;
- }
+ // Remove key from key pool
+ reservekey.KeepKey();
- // Process this block the same as if we had received it from another node
- CValidationState state;
- if (!ProcessBlock(state, NULL, pblock))
- return error("BitcoinMiner : ProcessBlock, block not accepted");
+ // Track how many getdata requests this block gets
+ {
+ LOCK(wallet.cs_wallet);
+ wallet.mapRequestCount[pblock->GetHash()] = 0;
}
+ // Process this block the same as if we had received it from another node
+ CValidationState state;
+ if (!ProcessBlock(state, NULL, pblock))
+ return error("BitcoinMiner : ProcessBlock, block not accepted");
+
return true;
}