Skip to content

Commit 40c11ac

Browse files
committed
Merge bitcoin/bitcoin#30624: doc: Remove outdated nTx faking comment
fa04511 doc: Remove outdated nTx faking comment (MarcoFalke) Pull request description: This problematic `nTx` "faking" was removed in commit b50554b. So fix the wrong comment. Also, address the typo nits from: * bitcoin/bitcoin#29370 (comment) * bitcoin/bitcoin#30598 (comment) ACKs for top commit: fjahr: ACK fa04511 Tree-SHA512: c918f0b9274be9c347a37d6221915688977a858fb8d2146035718bf17df0bd3b51d67ef12b971556851c0f69f46d26f557c35a5461abeb0683b538b9dc48f5b6
2 parents d00bf4e + fa04511 commit 40c11ac

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

src/validation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5399,7 +5399,7 @@ void ChainstateManager::CheckBlockIndex()
53995399
// and the transactions were not pruned (pindexFirstMissing
54005400
// is null), it is a potential candidate. The check
54015401
// excludes pruned blocks, because if any blocks were
5402-
// pruned between pindex the current chain tip, pindex will
5402+
// pruned between pindex and the current chain tip, pindex will
54035403
// only temporarily be added to setBlockIndexCandidates,
54045404
// before being moved to m_blocks_unlinked. This check
54055405
// could be improved to verify that if all blocks between

src/validation.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,8 +1094,7 @@ class ChainstateManager
10941094
//! - Verify that the hash of the resulting coinsdb matches the expected hash
10951095
//! per assumeutxo chain parameters.
10961096
//! - Wait for our headers chain to include the base block of the snapshot.
1097-
//! - "Fast forward" the tip of the new chainstate to the base of the snapshot,
1098-
//! faking nTx* block index data along the way.
1097+
//! - "Fast forward" the tip of the new chainstate to the base of the snapshot.
10991098
//! - Move the new chainstate to `m_snapshot_chainstate` and make it our
11001099
//! ChainstateActive().
11011100
[[nodiscard]] util::Result<CBlockIndex*> ActivateSnapshot(

test/functional/feature_assumeutxo.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ def expected_error(msg):
9696
self.log.info(" - snapshot file referring to a block that is not in the assumeutxo parameters")
9797
prev_block_hash = self.nodes[0].getblockhash(SNAPSHOT_BASE_HEIGHT - 1)
9898
bogus_block_hash = "0" * 64 # Represents any unknown block hash
99-
# The height is not used for anything critical currently, so we just
100-
# confirm the manipulation in the error message
10199
for bad_block_hash in [bogus_block_hash, prev_block_hash]:
102100
with open(bad_snapshot_path, 'wb') as f:
103101
f.write(valid_snapshot_contents[:11] + bytes.fromhex(bad_block_hash)[::-1] + valid_snapshot_contents[43:])

0 commit comments

Comments
 (0)