Remove unused CDiskBlockPos* argument from ProcessNewBlock

TheBlueMatt · TheBlueMatt · commit a13fa4c80f79 · 2016-12-04T00:23:17.000-08:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1951,7 +1951,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             bool fNewBlock = false;
             // Since we requested this block (it was in mapBlocksInFlight), force it to be processed,
             // even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)
-            ProcessNewBlock(chainparams, pblock, true, NULL, &fNewBlock);
+            ProcessNewBlock(chainparams, pblock, true, &fNewBlock);
             if (fNewBlock)
                 pfrom->nLastBlockTime = GetTime();
         }
@@ -2133,7 +2133,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true));
         }
         bool fNewBlock = false;
-        ProcessNewBlock(chainparams, pblock, forceProcessing, NULL, &fNewBlock);
+        ProcessNewBlock(chainparams, pblock, forceProcessing, &fNewBlock);
         if (fNewBlock)
             pfrom->nLastBlockTime = GetTime();
     }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -132,7 +132,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG
             continue;
         }
         std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
-        if (!ProcessNewBlock(Params(), shared_pblock, true, NULL, NULL))
+        if (!ProcessNewBlock(Params(), shared_pblock, true, NULL))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -760,7 +760,7 @@ UniValue submitblock(const JSONRPCRequest& request)
 
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(Params(), blockptr, true, NULL, NULL);
+    bool fAccepted = ProcessNewBlock(Params(), blockptr, true, NULL);
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
@@ -224,7 +224,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
         pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
         pblock->nNonce = blockinfo[i].nonce;
         std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
-        BOOST_CHECK(ProcessNewBlock(chainparams, shared_pblock, true, NULL, NULL));
+        BOOST_CHECK(ProcessNewBlock(chainparams, shared_pblock, true, NULL));
         pblock->hashPrevBlock = pblock->GetHash();
     }
 
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
@@ -128,7 +128,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
     while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
 
     std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
-    ProcessNewBlock(chainparams, shared_pblock, true, NULL, NULL);
+    ProcessNewBlock(chainparams, shared_pblock, true, NULL);
 
     CBlock result = block;
     return result;
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3127,7 +3127,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha
     return true;
 }
 
-bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock)
+bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, bool *fNewBlock)
 {
     {
         LOCK(cs_main);
@@ -3136,7 +3136,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons
         CBlockIndex *pindex = NULL;
         if (fNewBlock) *fNewBlock = false;
         CValidationState state;
-        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, fNewBlock);
+        bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock);
         CheckBlockIndex(chainparams.GetConsensus());
         if (!ret) {
             GetMainSignals().BlockChecked(*pblock, state);
diff --git a/src/validation.h b/src/validation.h
@@ -229,11 +229,10 @@ static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
  *
  * @param[in]   pblock  The block we want to process.
  * @param[in]   fForceProcessing Process this block even if unrequested; used for non-network block sources and whitelisted peers.
- * @param[out]  dbp     The already known disk position of pblock, or NULL if not yet stored.
  * @param[out]  fNewBlock A boolean which is set to indicate if the block was first received via this call
  * @return True if state.IsValid()
  */
-bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool* fNewBlock);
+bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, bool* fNewBlock);
 
 /**
  * Process incoming block headers.

Original file line number	Diff line number	Diff line change
`@@ -1951,7 +1951,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`1951`	`1951`	`bool fNewBlock = false;`
`1952`	`1952`	`// Since we requested this block (it was in mapBlocksInFlight), force it to be processed,`
`1953`	`1953`	`// even if it would not be a candidate for new tip (missing previous block, chain not long enough, etc)`
`1954`		`- ProcessNewBlock(chainparams, pblock, true, NULL, &fNewBlock);`
	`1954`	`+ ProcessNewBlock(chainparams, pblock, true, &fNewBlock);`
`1955`	`1955`	`if (fNewBlock)`
`1956`	`1956`	`pfrom->nLastBlockTime = GetTime();`
`1957`	`1957`	`}`
`@@ -2133,7 +2133,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`2133`	`2133`	`mapBlockSource.emplace(hash, std::make_pair(pfrom->GetId(), true));`
`2134`	`2134`	`}`
`2135`	`2135`	`bool fNewBlock = false;`
`2136`		`- ProcessNewBlock(chainparams, pblock, forceProcessing, NULL, &fNewBlock);`
	`2136`	`+ ProcessNewBlock(chainparams, pblock, forceProcessing, &fNewBlock);`
`2137`	`2137`	`if (fNewBlock)`
`2138`	`2138`	`pfrom->nLastBlockTime = GetTime();`
`2139`	`2139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)`
`224`	`224`	`pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);`
`225`	`225`	`pblock->nNonce = blockinfo[i].nonce;`
`226`	`226`	`std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);`
`227`		`- BOOST_CHECK(ProcessNewBlock(chainparams, shared_pblock, true, NULL, NULL));`
	`227`	`+ BOOST_CHECK(ProcessNewBlock(chainparams, shared_pblock, true, NULL));`
`228`	`228`	`pblock->hashPrevBlock = pblock->GetHash();`
`229`	`229`	`}`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -3127,7 +3127,7 @@ static bool AcceptBlock(const CBlock& block, CValidationState& state, const CCha`
`3127`	`3127`	`return true;`
`3128`	`3128`	`}`
`3129`	`3129`
`3130`		`-bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, const CDiskBlockPos* dbp, bool *fNewBlock)`
	`3130`	`+bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<const CBlock> pblock, bool fForceProcessing, bool *fNewBlock)`
`3131`	`3131`	`{`
`3132`	`3132`	`{`
`3133`	`3133`	`LOCK(cs_main);`
`@@ -3136,7 +3136,7 @@ bool ProcessNewBlock(const CChainParams& chainparams, const std::shared_ptr<cons`
`3136`	`3136`	`CBlockIndex *pindex = NULL;`
`3137`	`3137`	`if (fNewBlock) *fNewBlock = false;`
`3138`	`3138`	`CValidationState state;`
`3139`		`- bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, dbp, fNewBlock);`
	`3139`	`+ bool ret = AcceptBlock(*pblock, state, chainparams, &pindex, fForceProcessing, NULL, fNewBlock);`
`3140`	`3140`	`CheckBlockIndex(chainparams.GetConsensus());`
`3141`	`3141`	`if (!ret) {`
`3142`	`3142`	`GetMainSignals().BlockChecked(*pblock, state);`