diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-14 10:55:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-14 10:56:28 +0100 |
| commit | b68685a16a81729f4d10975171c23c407cd332e3 (patch) | |
| tree | 99c34663d1d6bdb55660979a6bbf5c2b4c404f98 /src/rpc | |
| parent | 57e337d40e94ba33d8cd265c134d6ef857b32b59 (diff) | |
| parent | a13fa4c80f792ffba8a77737754506aa849929af (diff) | |
| download | bitcoin-b68685a16a81729f4d10975171c23c407cd332e3.tar.xz | |
Merge #9273: Remove unused CDiskBlockPos* argument from ProcessNewBlock
a13fa4c Remove unused CDiskBlockPos* argument from ProcessNewBlock (Matt Corallo)
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 cb22dec342..73797e2019 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; } 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) { |