diff options
| author | Anthony Towns <aj@erisian.com.au> | 2021-06-11 06:59:53 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2021-06-30 08:19:12 +1000 |
| commit | c64b2c6a0f79369624ae96b2e3d579d50aae4de6 (patch) | |
| tree | 666e3fbbdf9ee9b06e40ac0955b90bf0fe6b4800 /src/rpc | |
| parent | de55304f6e7a8b607e6b3fc7436de50910747b0c (diff) | |
| download | bitcoin-c64b2c6a0f79369624ae96b2e3d579d50aae4de6.tar.xz | |
scripted-diff: rename versionbitscache
-BEGIN VERIFY SCRIPT-
sed -i -e 's/versionbitscache/g_versionbitscache/g' $(git grep -l versionbitscache)
-END VERIFY SCRIPT-
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/blockchain.cpp | 4 | ||||
| -rw-r--r-- | src/rpc/mining.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 7ba6e13142..7ceff17d0b 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1369,7 +1369,7 @@ static void BIP9SoftForkDescPushBack(const CBlockIndex* active_chain_tip, UniVal if (consensusParams.vDeployments[id].nStartTime == Consensus::BIP9Deployment::NEVER_ACTIVE) return; UniValue bip9(UniValue::VOBJ); - const ThresholdState thresholdState = VersionBitsState(active_chain_tip, consensusParams, id, versionbitscache); + const ThresholdState thresholdState = VersionBitsState(active_chain_tip, consensusParams, id, g_versionbitscache); switch (thresholdState) { case ThresholdState::DEFINED: bip9.pushKV("status", "defined"); break; case ThresholdState::STARTED: bip9.pushKV("status", "started"); break; @@ -1383,7 +1383,7 @@ static void BIP9SoftForkDescPushBack(const CBlockIndex* active_chain_tip, UniVal } bip9.pushKV("start_time", consensusParams.vDeployments[id].nStartTime); bip9.pushKV("timeout", consensusParams.vDeployments[id].nTimeout); - int64_t since_height = VersionBitsStateSinceHeight(active_chain_tip, consensusParams, id, versionbitscache); + int64_t since_height = VersionBitsStateSinceHeight(active_chain_tip, consensusParams, id, g_versionbitscache); bip9.pushKV("since", since_height); if (ThresholdState::STARTED == thresholdState) { diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index f054c8b145..d6ca0959f2 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -841,7 +841,7 @@ static RPCHelpMan getblocktemplate() UniValue vbavailable(UniValue::VOBJ); for (int j = 0; j < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++j) { Consensus::DeploymentPos pos = Consensus::DeploymentPos(j); - ThresholdState state = VersionBitsState(pindexPrev, consensusParams, pos, versionbitscache); + ThresholdState state = VersionBitsState(pindexPrev, consensusParams, pos, g_versionbitscache); switch (state) { case ThresholdState::DEFINED: case ThresholdState::FAILED: |