Merge branch 'beta' into dev

This commit is contained in:
jl777
2018-05-23 15:18:21 +03:00
committed by GitHub
9 changed files with 56 additions and 75 deletions

View File

@@ -242,7 +242,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
CValidationState state;
if (ProcessNewBlock(1,state, NULL, pblock, true, NULL) && state.IsValid()) {
if (ProcessNewBlock(1,0,state, NULL, pblock, true, NULL) && state.IsValid()) {
goto foundit;
}
@@ -261,7 +261,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
*/
CValidationState state;
BOOST_CHECK(ProcessNewBlock(1,state, NULL, pblock, true, NULL));
BOOST_CHECK(ProcessNewBlock(1,0,state, NULL, pblock, true, NULL));
BOOST_CHECK_MESSAGE(state.IsValid(), state.GetRejectReason());
pblock->hashPrevBlock = pblock->GetHash();