Skip to content

Commit

Permalink
Merge bitcoin#13154: Trivial: s/SetBestChain/ChainStateFlushed in com…
Browse files Browse the repository at this point in the history
…ments after bitcoin#13106

21f5680 Trivial: s/SetBestChain/ChainStateFlushed in comments after bitcoin#13106 (Russell Yanofsky)

Pull request description:

Tree-SHA512: 373896dd73c3ba202739433b22320a4b7ea6dc80ef84547b4ed72c7ae0d6746b109c8b1879359c43374d1816fe384cc31b24b87879ddefe993887140c2f0df9c
  • Loading branch information
laanwj authored and erhari08 committed Jun 4, 2021
1 parent a92276d commit 06c597c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions src/chainparams.cpp
Expand Up @@ -521,10 +521,11 @@ class CMainParams : public CChainParams {
};

chainTxData = ChainTxData{
1617874573, // * UNIX timestamp of last known number of transactions (Block 1450962)
34709765, // * total number of transactions between genesis and that timestamp
// (the tx=... number in the SetBestChain debug.log lines)
0.3 // * estimated number of transactions per second after that timestamp
// Data as of block 0000000000000000002d6cca6761c99b3c2e936f9a0e304b7c7651a993f461de (height 506081).
1516903077, // * UNIX timestamp of last known number of transactions
295363220, // * total number of transactions between genesis and that timestamp
// (the tx=... number in the ChainStateFlushed debug.log lines)
3.5 // * estimated number of transactions per second after that timestamp
};
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/init.cpp
Expand Up @@ -308,7 +308,7 @@ void PrepareShutdown()
fFeeEstimatesInitialized = false;
}

// FlushStateToDisk generates a SetBestChain callback, which we should avoid missing
// FlushStateToDisk generates a ChainStateFlushed callback, which we should avoid missing
if (pcoinsTip != nullptr) {
FlushStateToDisk();
}
Expand Down

0 comments on commit 06c597c

Please sign in to comment.