Make the optional pblock in ActivateBestChain a shared_ptr

2016-10-15 14:01:31 -04:00
parent ae4db44d03
commit 2736c44c8e
3 changed files with 14 additions and 9 deletions
@@ -1319,7 +1319,7 @@ UniValue invalidateblock(const JSONRPCRequest& request)
    }

    if (state.IsValid()) {
-        ActivateBestChain(state, Params(), NULL);
+        ActivateBestChain(state, Params());
    }

    if (!state.IsValid()) {
@@ -1357,7 +1357,7 @@ UniValue reconsiderblock(const JSONRPCRequest& request)
    }

    CValidationState state;
-    ActivateBestChain(state, Params(), NULL);
+    ActivateBestChain(state, Params());

    if (!state.IsValid()) {
        throw JSONRPCError(RPC_DATABASE_ERROR, state.GetRejectReason());