From 2885bd0e1c4fc863a7f28ff0fd353f5cffb03442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C5=91rinc?= Date: Tue, 19 Aug 2025 20:34:07 -0700 Subject: [PATCH] doc: unify `datacarriersize` warning with release notes Unified the deprecation warning for the recently deprecated datacarrier[size] options to match the phrasing of release-notes-32406.md. --- src/init.cpp | 2 +- test/functional/mempool_datacarrier.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index b6b52e2cea5..b2f59a60b72 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -904,7 +904,7 @@ bool AppInitParameterInteraction(const ArgsManager& args) } if (args.IsArgSet("-datacarriersize") || args.IsArgSet("-datacarrier")) { - InitWarning(_("Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.")); + 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. diff --git a/test/functional/mempool_datacarrier.py b/test/functional/mempool_datacarrier.py index 629bac208d5..40d3d2b3ab9 100755 --- a/test/functional/mempool_datacarrier.py +++ b/test/functional/mempool_datacarrier.py @@ -103,9 +103,9 @@ class DataCarrierTest(BitcoinTestFramework): # 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. They will be removed in a future version.", - "Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.", - "Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will 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.", + "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):