Merge bitcoin#23600: doc: Tidy up nMinDiskSpace comment

fanquake · knst · commit b4cd8d500f59 · 2025-03-06T13:30:37.000+07:00
fa5a886 doc: Tidy up nMinDiskSpace comment (MarcoFalke) Pull request description: nMinDiskSpace was removed in commit 04cca33 Also, remove incorrect doxygen comment. See https://doxygen.bitcoincore.org/class_c_chain.html#aeb563751f7362d4308c7c2cb35b834a5 ACKs for top commit: theStack: ACK fa5a886 Tree-SHA512: d57a6a0f0a66615bebb3cca19dc831cca38be0f18a580bb88e774384c55ccc545279b6d115b86fda70528a86630065393fb692fc2997ef87f97eec2d162808bb
diff --git a/src/chain.cpp b/src/chain.cpp
@@ -13,9 +13,6 @@ std::string CBlockIndex::ToString() const
                      pprev, nHeight, hashMerkleRoot.ToString(), GetBlockHash().ToString());
 }
 
-/**
- * CChain implementation
- */
 void CChain::SetTip(CBlockIndex *pindex) {
     if (pindex == nullptr) {
         vChain.clear();
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2710,7 +2710,7 @@ bool CChainState::FlushStateToDisk(
         fDoFullFlush = (mode == FlushStateMode::ALWAYS) || fCacheLarge || fCacheCritical || fEvoDbCacheCritical || fPeriodicFlush || fFlushForPrune;
         // Write blocks and block index to disk.
         if (fDoFullFlush || fPeriodicWrite) {
-            // Depend on nMinDiskSpace to ensure we can write block index
+            // Ensure we can write block index
             if (!CheckDiskSpace(gArgs.GetBlocksDirPath())) {
                 return AbortNode(state, "Disk space is too low!", _("Disk space is too low!"));
             }

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@ std::string CBlockIndex::ToString() const`
`13`	`13`	`pprev, nHeight, hashMerkleRoot.ToString(), GetBlockHash().ToString());`
`14`	`14`	`}`
`15`	`15`
`16`		`-/**`
`17`		`- * CChain implementation`
`18`		`- */`
`19`	`16`	`void CChain::SetTip(CBlockIndex *pindex) {`
`20`	`17`	`if (pindex == nullptr) {`
`21`	`18`	`vChain.clear();`
Original file line number	Diff line number	Diff line change
`@@ -2710,7 +2710,7 @@ bool CChainState::FlushStateToDisk(`
`2710`	`2710`	`fDoFullFlush = (mode == FlushStateMode::ALWAYS) \|\| fCacheLarge \|\| fCacheCritical \|\| fEvoDbCacheCritical \|\| fPeriodicFlush \|\| fFlushForPrune;`
`2711`	`2711`	`// Write blocks and block index to disk.`
`2712`	`2712`	`if (fDoFullFlush \|\| fPeriodicWrite) {`
`2713`		`- // Depend on nMinDiskSpace to ensure we can write block index`
	`2713`	`+ // Ensure we can write block index`
`2714`	`2714`	`if (!CheckDiskSpace(gArgs.GetBlocksDirPath())) {`
`2715`	`2715`	`return AbortNode(state, "Disk space is too low!", _("Disk space is too low!"));`
`2716`	`2716`	`}`