rpc: Reorder getchaintxstats output

This commit is contained in:
MarcoFalke 2024-04-26 17:59:05 +02:00
parent fa2dada0c9
commit faf2a6750b
No known key found for this signature in database

View file

@ -1651,10 +1651,10 @@ static RPCHelpMan getchaintxstats()
{RPCResult::Type::STR_HEX, "window_final_block_hash", "The hash of the final block in the window"}, {RPCResult::Type::STR_HEX, "window_final_block_hash", "The hash of the final block in the window"},
{RPCResult::Type::NUM, "window_final_block_height", "The height of the final block in the window."}, {RPCResult::Type::NUM, "window_final_block_height", "The height of the final block in the window."},
{RPCResult::Type::NUM, "window_block_count", "Size of the window in number of blocks"}, {RPCResult::Type::NUM, "window_block_count", "Size of the window in number of blocks"},
{RPCResult::Type::NUM, "window_interval", /*optional=*/true, "The elapsed time in the window in seconds. Only returned if \"window_block_count\" is > 0"},
{RPCResult::Type::NUM, "window_tx_count", /*optional=*/true, {RPCResult::Type::NUM, "window_tx_count", /*optional=*/true,
"The number of transactions in the window. " "The number of transactions in the window. "
"Only returned if \"window_block_count\" is > 0 and if txcount exists for the start and end of the window."}, "Only returned if \"window_block_count\" is > 0 and if txcount exists for the start and end of the window."},
{RPCResult::Type::NUM, "window_interval", /*optional=*/true, "The elapsed time in the window in seconds. Only returned if \"window_block_count\" is > 0"},
{RPCResult::Type::NUM, "txrate", /*optional=*/true, {RPCResult::Type::NUM, "txrate", /*optional=*/true,
"The average rate of transactions per second in the window. " "The average rate of transactions per second in the window. "
"Only returned if \"window_interval\" is > 0 and if window_tx_count exists."}, "Only returned if \"window_interval\" is > 0 and if window_tx_count exists."},
@ -1711,12 +1711,12 @@ static RPCHelpMan getchaintxstats()
ret.pushKV("window_final_block_height", pindex->nHeight); ret.pushKV("window_final_block_height", pindex->nHeight);
ret.pushKV("window_block_count", blockcount); ret.pushKV("window_block_count", blockcount);
if (blockcount > 0) { if (blockcount > 0) {
ret.pushKV("window_interval", nTimeDiff);
if (window_tx_count) { if (window_tx_count) {
ret.pushKV("window_tx_count", *window_tx_count); ret.pushKV("window_tx_count", *window_tx_count);
} if (nTimeDiff > 0) {
ret.pushKV("window_interval", nTimeDiff); ret.pushKV("txrate", double(*window_tx_count) / nTimeDiff);
if (nTimeDiff > 0 && window_tx_count) { }
ret.pushKV("txrate", double(*window_tx_count) / nTimeDiff);
} }
} }