highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-10 20:53:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpc: fix maybe-uninitialized compile warning in getchaintxstats

Browse Source 
This resolves the compiler warning about potential uninitialized
use of window_tx_count introduced in fa2dada.
This commit is contained in:
Michael Dietz
2024-07-29 12:14:27 -05:00
parent 30cef53707
commit 2e86f2b201
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpc/blockchain.cpp
View File

@@ -1722,9 +1722,6 @@ static RPCHelpMan getchaintxstats()
const CBlockIndex& past_block{*CHECK_NONFATAL(pindex->GetAncestor(pindex->nHeight - blockcount))}; const CBlockIndex& past_block{*CHECK_NONFATAL(pindex->GetAncestor(pindex->nHeight - blockcount))};
const int64_t nTimeDiff{pindex->GetMedianTimePast() - past_block.GetMedianTimePast()}; const int64_t nTimeDiff{pindex->GetMedianTimePast() - past_block.GetMedianTimePast()};
const auto window_tx_count{
(pindex->nChainTx != 0 && past_block.nChainTx != 0) ? std::optional{pindex->nChainTx - past_block.nChainTx} : std::nullopt,
};
UniValue ret(UniValue::VOBJ); UniValue ret(UniValue::VOBJ);
ret.pushKV("time", (int64_t)pindex->nTime); ret.pushKV("time", (int64_t)pindex->nTime);
@@ -1736,10 +1733,11 @@ static RPCHelpMan getchaintxstats()
ret.pushKV("window_block_count", blockcount); ret.pushKV("window_block_count", blockcount);
if (blockcount > 0) { if (blockcount > 0) {
ret.pushKV("window_interval", nTimeDiff); ret.pushKV("window_interval", nTimeDiff);
if (window_tx_count) { if (pindex->nChainTx != 0 && past_block.nChainTx != 0) {
ret.pushKV("window_tx_count", *window_tx_count); const auto window_tx_count = pindex->nChainTx - past_block.nChainTx;
ret.pushKV("window_tx_count", window_tx_count);
if (nTimeDiff > 0) { if (nTimeDiff > 0) {
ret.pushKV("txrate", double(*window_tx_count) / nTimeDiff); ret.pushKV("txrate", double(window_tx_count) / nTimeDiff);
} }
} }
} }