diff --git a/src/init.cpp b/src/init.cpp index b2f59a60b72..50ac02ae854 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -658,9 +658,9 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc) argsman.AddArg("-dustrelayfee=", strprintf("Fee rate (in %s/kvB) used to define dust, the value of an output such that it will cost more than its value in fees at this fee rate to spend it. (default: %s)", CURRENCY_UNIT, FormatMoney(DUST_RELAY_TX_FEE)), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::NODE_RELAY); argsman.AddArg("-acceptstalefeeestimates", strprintf("Read fee estimates even if they are stale (%sdefault: %u) fee estimates are considered stale if they are %s hours old", "regtest only; ", DEFAULT_ACCEPT_STALE_FEE_ESTIMATES, Ticks(MAX_FILE_AGE)), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST); argsman.AddArg("-bytespersigop", strprintf("Equivalent bytes per sigop in transactions for relay and mining (default: %u)", DEFAULT_BYTES_PER_SIGOP), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY); - argsman.AddArg("-datacarrier", strprintf("(DEPRECATED) Relay and mine data carrier transactions (default: %u)", DEFAULT_ACCEPT_DATACARRIER), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY); + argsman.AddArg("-datacarrier", strprintf("Relay and mine data carrier transactions (default: %u)", DEFAULT_ACCEPT_DATACARRIER), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY); argsman.AddArg("-datacarriersize", - strprintf("(DEPRECATED) Relay and mine transactions whose data-carrying raw scriptPubKeys in aggregate " + strprintf("Relay and mine transactions whose data-carrying raw scriptPubKeys in aggregate " "are of this size or less, allowing multiple outputs (default: %u)", MAX_OP_RETURN_RELAY), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY); @@ -903,10 +903,6 @@ bool AppInitParameterInteraction(const ArgsManager& args) InitWarning(_("Option '-checkpoints' is set but checkpoints were removed. This option has no effect.")); } - if (args.IsArgSet("-datacarriersize") || args.IsArgSet("-datacarrier")) { - InitWarning(_("Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated and are expected to be removed in a future version.")); - } - // We no longer limit the orphanage based on number of transactions but keep the option to warn users who still have it in their config. if (args.IsArgSet("-maxorphantx")) { InitWarning(_("Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.")); diff --git a/test/functional/mempool_datacarrier.py b/test/functional/mempool_datacarrier.py index 40d3d2b3ab9..ca113fcbceb 100755 --- a/test/functional/mempool_datacarrier.py +++ b/test/functional/mempool_datacarrier.py @@ -100,17 +100,5 @@ class DataCarrierTest(BitcoinTestFramework): self.test_null_data_transaction(node=self.nodes[2], data=one_byte, success=True) self.test_null_data_transaction(node=self.nodes[3], data=one_byte, success=False) - # Clean shutdown boilerplate due to deprecation - self.expected_stderr = [ - "", # node 0 has no deprecated options - "Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated and are expected to be removed in a future version.", - "Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated and are expected to be removed in a future version.", - "Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated and are expected to be removed in a future version.", - ] - - for i in range(self.num_nodes): - self.stop_node(i, expected_stderr=self.expected_stderr[i]) - - if __name__ == '__main__': DataCarrierTest(__file__).main()