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/test | |
| 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/test')
| -rw-r--r-- | src/test/miner_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 93b7fe189a..032ae983ce 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) pblock->hashMerkleRoot = pblock->BuildMerkleTree(); pblock->nNonce = blockinfo[i].nonce; CValidationState state; - BOOST_CHECK(ProcessBlock(state, NULL, pblock)); + BOOST_CHECK(ProcessNewBlock(state, NULL, pblock)); BOOST_CHECK(state.IsValid()); pblock->hashPrevBlock = pblock->GetHash(); } |