From a303cde2fd11b4d60e7674ecf2a8ada1c0c33ca6 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Fri, 30 Aug 2024 17:28:45 +0000 Subject: [PATCH] Allow acceptstalefeeestimates on all networks --- src/init.cpp | 3 --- test/functional/feature_config_args.py | 1 - 2 files changed, 4 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index faaf3353d0..cfe55b57f1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1290,9 +1290,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) // as they would never get updated. if (!peerman_opts.ignore_incoming_txs) { 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(FeeestPath(args), read_stale_estimates); // Flush estimates to disk periodically diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index bb20e2baa8..f776596c9a 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -421,7 +421,6 @@ class ConfArgsTest(BitcoinTestFramework): self.test_invalid_command_line_options() self.test_ignored_conf() self.test_ignored_default_conf() - self.test_acceptstalefeeestimates_arg_support() self.test_testnet3_deprecation_msg() # Remove the -datadir argument so it doesn't override the config file