Bugfix: RPC/blockchain: pruneblockchain: Return the height of the actual last pruned block

From 0.14 (2017 Mar) until before 0.19 (2019 Nov), the height of the last
block pruned was returned, subject to a bug if there were blocks left unpruned
due to sharing files with later blocks.

In #15991, this was "fixed" to the current implementation, introducing a new
bug: now, it returns the first *unpruned* block.

Since the user provides the parameter as a block to include in pruning, it
makes more sense to fix the behaviour to match the documentation.
This commit is contained in:
Luke Dashjr
2022-03-21 18:38:54 +00:00
parent 2cf8c2caea
commit e593ae07c4
3 changed files with 5 additions and 5 deletions

View File

@@ -790,7 +790,7 @@ static RPCHelpMan pruneblockchain()
const CBlockIndex& block{*CHECK_NONFATAL(active_chain.Tip())};
const CBlockIndex* last_block{active_chainstate.m_blockman.GetFirstStoredBlock(block)};
return static_cast<uint64_t>(last_block->nHeight);
return static_cast<int64_t>(last_block->nHeight - 1);
},
};
}