From bddc6f24a548c1bad255fa8e0f7a02ac62456fb6 Mon Sep 17 00:00:00 2001 From: Ray Engelking Date: Tue, 16 Jan 2018 17:15:16 -0500 Subject: [PATCH] minor miner corrections --- src/pow.cpp | 0 src/rpc/mining.cpp | 3 +-- src/test/main_tests.cpp | 2 +- src/test/miner_tests.cpp | 0 4 files changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/pow.cpp mode change 100644 => 100755 src/test/miner_tests.cpp diff --git a/src/pow.cpp b/src/pow.cpp old mode 100644 new mode 100755 diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 25f7658fc..2f8216c12 100755 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -120,8 +120,7 @@ UniValue generateBlocks(std::shared_ptr coinbaseScript, int nGen UniValue blockHashes(UniValue::VARR); while (nHeight < nHeightEnd) { -// std::unique_ptr pblocktemplate(BlockAssembler(Params()).CreateNewBlock(coinbaseScript->reserveScript, true, strTxComment)); - std::unique_ptr pblocktemplate(BlockAssembler(Params()).CreateNewBlock(coinbaseScript->reserveScript, true)); + std::unique_ptr pblocktemplate(BlockAssembler(Params()).CreateNewBlock(coinbaseScript->reserveScript, true, strTxComment)); if (!pblocktemplate.get()) throw JSONRPCError(RPC_INTERNAL_ERROR, "Couldn't create new block"); CBlock *pblock = &pblocktemplate->block; diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index 83d5d757f..600877d15 100755 --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(subsidy_limit_test) nSum += nSubsidy * 1000; BOOST_CHECK(MoneyRange(nSum)); } - BOOST_CHECK_EQUAL(nSum, 8399999990760000ULL); + BOOST_CHECK_EQUAL(nSum, 15999999991200000ULL); } bool ReturnFalse() { return false; } diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp old mode 100644 new mode 100755