mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-05-28 13:02:38 +02:00
Merge acceptstalefeeestimates_mainnet_opt
This commit is contained in:
commit
04db65df5e
@ -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<CBlockPolicyEstimator>(FeeestPath(args), read_stale_estimates);
|
||||
|
||||
// Flush estimates to disk periodically
|
||||
|
@ -420,7 +420,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
|
||||
|
Loading…
Reference in New Issue
Block a user