aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinstagibbs <gsanders87@gmail.com>2016-05-09 11:26:37 -0400
committerinstagibbs <gsanders87@gmail.com>2016-05-09 11:26:37 -0400
commit657e07efa34ffe9d8614a618e00452c9ee7c0e0d (patch)
tree4a67d2948791dc34d02e48883513fb6f1b1f5bf3 /src
parentaddb9d2a092b4fd0384d4ff82e9607e5411eab97 (diff)
downloadbitcoin-657e07efa34ffe9d8614a618e00452c9ee7c0e0d.tar.xz
Rename ReconsiderBlock func to reflect real behavior
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h2
-rw-r--r--src/rpc/blockchain.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 9489bb1c46..11eaa055d7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3011,7 +3011,7 @@ bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, C
return true;
}
-bool ReconsiderBlock(CBlockIndex *pindex) {
+bool ResetBlockFailureFlags(CBlockIndex *pindex) {
AssertLockHeld(cs_main);
int nHeight = pindex->nHeight;
diff --git a/src/main.h b/src/main.h
index e48cebecb3..ebbd12c8c3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -464,7 +464,7 @@ CBlockIndex* FindForkInGlobalIndex(const CChain& chain, const CBlockLocator& loc
bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, CBlockIndex *pindex);
/** Remove invalidity status from a block and its descendants. */
-bool ReconsiderBlock(CBlockIndex *pindex);
+bool ResetBlockFailureFlags(CBlockIndex *pindex);
/** The currently-connected chain of blocks (protected by cs_main). */
extern CChain chainActive;
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index d221012afa..cf3c73c4df 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -980,7 +980,7 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
CBlockIndex* pblockindex = mapBlockIndex[hash];
- ReconsiderBlock(pblockindex);
+ ResetBlockFailureFlags(pblockindex);
}
CValidationState state;