diff options
| author | Jorge Timón <[email protected]> | 2015-04-17 14:40:24 +0200 |
|---|---|---|
| committer | Jorge Timón <[email protected]> | 2015-11-23 12:14:40 +0100 |
| commit | 2e29e7e247b6b74502c70612dab1f7f67de675c3 (patch) | |
| tree | c5e4e5a8d5364f501af5f7664b731e6f10cb0589 /src/rpcblockchain.cpp | |
| parent | Merge pull request #7026 (diff) | |
| download | discoin-2e29e7e247b6b74502c70612dab1f7f67de675c3.tar.xz discoin-2e29e7e247b6b74502c70612dab1f7f67de675c3.zip | |
Globals: Remove a bunch of Params() calls from main.cpp:
1) Chainparams: Explicit CChainParams arg for main:
-AcceptBlock
-AcceptBlockHeader
-ActivateBestChain
-ConnectTip
-InitBlockIndex
-LoadExternalBlockFile
-VerifyDB parametric constructor
2) Also pickup more Params()\. in main.cpp
3) Pass nPruneAfterHeight explicitly to new FindFilesToPrune() in main.cpp
Diffstat (limited to 'src/rpcblockchain.cpp')
| -rw-r--r-- | src/rpcblockchain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 9c0e78f77..5fa707f94 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -562,7 +562,7 @@ UniValue verifychain(const UniValue& params, bool fHelp) if (params.size() > 1) nCheckDepth = params[1].get_int(); - return CVerifyDB().VerifyDB(pcoinsTip, nCheckLevel, nCheckDepth); + return CVerifyDB().VerifyDB(Params(), pcoinsTip, nCheckLevel, nCheckDepth); } /** Implementation of IsSuperMajority with better feedback */ @@ -828,7 +828,7 @@ UniValue invalidateblock(const UniValue& params, bool fHelp) } if (state.IsValid()) { - ActivateBestChain(state); + ActivateBestChain(state, Params()); } if (!state.IsValid()) { @@ -867,7 +867,7 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp) } if (state.IsValid()) { - ActivateBestChain(state); + ActivateBestChain(state, Params()); } if (!state.IsValid()) { |