diff --git a/src/main.cpp b/src/main.cpp index f48b4242c..9c1eaa056 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1343,7 +1343,7 @@ bool ReadBlockFromDisk(int32_t height,CBlock& block, const CDiskBlockPos& pos) if (filein.IsNull()) { //fprintf(stderr,"readblockfromdisk err A\n"); - return false; //error("ReadBlockFromDisk: OpenBlockFile failed for %s", pos.ToString()); + return error("ReadBlockFromDisk: OpenBlockFile failed for %s", pos.ToString()); } // Read block diff --git a/src/miner.cpp b/src/miner.cpp index f28d7756d..2d90c40c4 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -360,7 +360,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]); CValidationState state; - if (!TestBlockValidity(state, *pblock, pindexPrev, false, false)) + if ( 0 && !TestBlockValidity(state, *pblock, pindexPrev, false, false)) throw std::runtime_error("CreateNewBlock(): TestBlockValidity failed"); } diff --git a/src/pow.cpp b/src/pow.cpp index 08e052c4f..b7f241155 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -134,7 +134,6 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in // Check range if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit)) return error("CheckProofOfWork(): nBits below minimum work"); - // Check proof of work matches claimed amount if (UintToArith256(hash) > bnTarget) {