Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-02 07:22:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge acceptstalefeeestimates_mainnet_opt

Browse Source
This commit is contained in:
Luke Dashjr 2025-03-05 03:27:08 +00:00
commit 04db65df5e
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/init.cpp
View File

@ -1290,9 +1290,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
// as they would never get updated. // as they would never get updated.
if (!peerman_opts.ignore_incoming_txs) { if (!peerman_opts.ignore_incoming_txs) {
bool read_stale_estimates = args.GetBoolArg("-acceptstalefeeestimates", DEFAULT_ACCEPT_STALE_FEE_ESTIMATES); bool read_stale_estimates = args.GetBoolArg("-acceptstalefeeestimates", DEFAULT_ACCEPT_STALE_FEE_ESTIMATES);
if (read_stale_estimates && (chainparams.GetChainType() != ChainType::REGTEST)) {
return InitError(strprintf(_("acceptstalefeeestimates is not supported on %s chain."), chainparams.GetChainTypeString()));
}
node.fee_estimator = std::make_unique<CBlockPolicyEstimator>(FeeestPath(args), read_stale_estimates); node.fee_estimator = std::make_unique<CBlockPolicyEstimator>(FeeestPath(args), read_stale_estimates);
// Flush estimates to disk periodically // Flush estimates to disk periodically

1
test/functional/feature_config_args.py
View File

@ -420,7 +420,6 @@ class ConfArgsTest(BitcoinTestFramework):
self.test_invalid_command_line_options() self.test_invalid_command_line_options()
self.test_ignored_conf() self.test_ignored_conf()
self.test_ignored_default_conf() self.test_ignored_default_conf()
self.test_acceptstalefeeestimates_arg_support()
self.test_testnet3_deprecation_msg() self.test_testnet3_deprecation_msg()
# Remove the -datadir argument so it doesn't override the config file # Remove the -datadir argument so it doesn't override the config file