diff options
| author | Matt Corallo <git@bluematt.me> | 2016-10-02 11:04:49 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2016-11-09 11:21:45 -0800 |
| commit | 7c98ce584ec23bcddcba8cdb33efa6547212f6ef (patch) | |
| tree | 4967bdd0c6147d73bc1512cbf79b8f24c07180e5 /src/rpc | |
| parent | e2e069dabcd7e61e14bb7bceda6c19ec3afa358a (diff) | |
| download | bitcoin-7c98ce584ec23bcddcba8cdb33efa6547212f6ef.tar.xz | |
Remove pfrom parameter from ProcessNewBlock
This further decouples ProcessNewBlock from networking/peer logic.
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/mining.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 3e91a79a64..d9fe9530a1 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -132,7 +132,7 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG continue; } CValidationState state; - if (!ProcessNewBlock(state, Params(), NULL, pblock, true, NULL, false)) + if (!ProcessNewBlock(state, Params(), pblock, true, NULL, NULL)) throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted"); ++nHeight; blockHashes.push_back(pblock->GetHash().GetHex()); @@ -757,7 +757,7 @@ UniValue submitblock(const JSONRPCRequest& request) CValidationState state; submitblock_StateCatcher sc(block.GetHash()); RegisterValidationInterface(&sc); - bool fAccepted = ProcessNewBlock(state, Params(), NULL, &block, true, NULL, false); + bool fAccepted = ProcessNewBlock(state, Params(), &block, true, NULL, NULL); UnregisterValidationInterface(&sc); if (fBlockPresent) { |