diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-03 12:16:12 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-03 12:22:45 +0100 |
| commit | 84d26d3a36db589cabec2529a6936ad3efa90c6b (patch) | |
| tree | 8a9e6c0539868013f9a574b49cc97a0100b64734 /src/miner.cpp | |
| parent | 2a6972133f07382d13e08edc9c2e6c231689b2db (diff) | |
| parent | 1bea2bbddce6abaf2640c4aab56ad08de53c4b90 (diff) | |
| download | bitcoin-84d26d3a36db589cabec2529a6936ad3efa90c6b.tar.xz | |
Merge pull request #5106
1bea2bb Rename ProcessBlock to ProcessNewBlock to indicate change of behaviour, and document it (Luke Dashjr)
d29a291 Rename RPC_TRANSACTION_* errors to RPC_VERIFY_* and use RPC_VERIFY_ERROR for submitblock (Luke Dashjr)
f877aaa Bugfix: submitblock: Use a temporary CValidationState to determine accurately the outcome of ProcessBlock, now that it no longer does the full block validity check (Luke Dashjr)
24e8896 Add CValidationInterface::BlockChecked notification (Luke Dashjr)
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 0235de3ab3..b5bfa9c7be 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -428,8 +428,8 @@ bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) // 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"); + if (!ProcessNewBlock(state, NULL, pblock)) + return error("BitcoinMiner : ProcessNewBlock, block not accepted"); return true; } |