diff options
| author | fanquake <fanquake@gmail.com> | 2021-11-28 09:42:37 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-11-28 09:42:52 +0800 |
| commit | 4aa06f944768bd81022ef29096a1021433cfa482 (patch) | |
| tree | e51d89812f429e5db496c6374f9a3a294edac67c | |
| parent | 200d97faf2ed0bd0cbef93dd4bbbe77cf8fe5d13 (diff) | |
| parent | fa5a886fa3a1d5bef80248a421b1e11aa991d477 (diff) | |
Merge bitcoin/bitcoin#23600: doc: Tidy up nMinDiskSpace comment
fa5a886fa3a1d5bef80248a421b1e11aa991d477 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 fa5a886fa3a1d5bef80248a421b1e11aa991d477
Tree-SHA512: d57a6a0f0a66615bebb3cca19dc831cca38be0f18a580bb88e774384c55ccc545279b6d115b86fda70528a86630065393fb692fc2997ef87f97eec2d162808bb
| -rw-r--r-- | src/chain.cpp | 3 | ||||
| -rw-r--r-- | src/validation.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/chain.cpp b/src/chain.cpp index c09113a866..5d182e1af8 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -5,9 +5,6 @@ #include <chain.h> -/** - * CChain implementation - */ void CChain::SetTip(CBlockIndex *pindex) { if (pindex == nullptr) { vChain.clear(); diff --git a/src/validation.cpp b/src/validation.cpp index 881b0abc74..c96adb77ff 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2043,7 +2043,7 @@ bool CChainState::FlushStateToDisk( fDoFullFlush = (mode == FlushStateMode::ALWAYS) || fCacheLarge || fCacheCritical || 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!")); } |