mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 06:52:36 +01:00
Code Issues Projects Releases Wiki Activity

doc: Remove outdated nTx faking comment

Browse source 
This was fixed in commit b50554babd.

Also, address the typo nits from:

* https://github.com/bitcoin/bitcoin/pull/29370#discussion_r1531789314
* https://github.com/bitcoin/bitcoin/pull/30598#discussion_r1711982543
This commit is contained in:
MarcoFalke 2024-08-10 10:41:09 +02:00
parent c2d15d993e
commit fa04511e44
No known key found for this signature in database
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -5399,7 +5399,7 @@ void ChainstateManager::CheckBlockIndex()
// and the transactions were not pruned (pindexFirstMissing // and the transactions were not pruned (pindexFirstMissing
// is null), it is a potential candidate. The check // is null), it is a potential candidate. The check
// excludes pruned blocks, because if any blocks were // excludes pruned blocks, because if any blocks were
// pruned between pindex the current chain tip, pindex will // pruned between pindex and the current chain tip, pindex will
// only temporarily be added to setBlockIndexCandidates, // only temporarily be added to setBlockIndexCandidates,
// before being moved to m_blocks_unlinked. This check // before being moved to m_blocks_unlinked. This check
// could be improved to verify that if all blocks between // could be improved to verify that if all blocks between

3
src/validation.h
View file

@ -1094,8 +1094,7 @@ public:
//! - Verify that the hash of the resulting coinsdb matches the expected hash //! - Verify that the hash of the resulting coinsdb matches the expected hash
//! per assumeutxo chain parameters. //! per assumeutxo chain parameters.
//! - Wait for our headers chain to include the base block of the snapshot. //! - Wait for our headers chain to include the base block of the snapshot.
//! - "Fast forward" the tip of the new chainstate to the base of the snapshot, //! - "Fast forward" the tip of the new chainstate to the base of the snapshot.
//! faking nTx* block index data along the way.
//! - Move the new chainstate to `m_snapshot_chainstate` and make it our //! - Move the new chainstate to `m_snapshot_chainstate` and make it our
//! ChainstateActive(). //! ChainstateActive().
[[nodiscard]] util::Result<CBlockIndex*> ActivateSnapshot( [[nodiscard]] util::Result<CBlockIndex*> ActivateSnapshot(

2
test/functional/feature_assumeutxo.py
View file

@ -96,8 +96,6 @@ class AssumeutxoTest(BitcoinTestFramework):
self.log.info(" - snapshot file referring to a block that is not in the assumeutxo parameters") self.log.info(" - snapshot file referring to a block that is not in the assumeutxo parameters")
prev_block_hash = self.nodes[0].getblockhash(SNAPSHOT_BASE_HEIGHT - 1) prev_block_hash = self.nodes[0].getblockhash(SNAPSHOT_BASE_HEIGHT - 1)
bogus_block_hash = "0" * 64 # Represents any unknown block hash bogus_block_hash = "0" * 64 # Represents any unknown block hash
# The height is not used for anything critical currently, so we just
# confirm the manipulation in the error message
for bad_block_hash in [bogus_block_hash, prev_block_hash]: for bad_block_hash in [bogus_block_hash, prev_block_hash]:
with open(bad_snapshot_path, 'wb') as f: with open(bad_snapshot_path, 'wb') as f:
f.write(valid_snapshot_contents[:11] + bytes.fromhex(bad_block_hash)[::-1] + valid_snapshot_contents[43:]) f.write(valid_snapshot_contents[:11] + bytes.fromhex(bad_block_hash)[::-1] + valid_snapshot_contents[43:])