Skip to content

Commit 2885bd0

Browse files
committed
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.
1 parent f5f853d commit 2885bd0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
904904
}
905905

906906
if (args.IsArgSet("-datacarriersize") || args.IsArgSet("-datacarrier")) {
907-
InitWarning(_("Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version."));
907+
InitWarning(_("Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated and are expected to be removed in a future version."));
908908
}
909909

910910
// 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.

test/functional/mempool_datacarrier.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ def run_test(self):
103103
# Clean shutdown boilerplate due to deprecation
104104
self.expected_stderr = [
105105
"", # node 0 has no deprecated options
106-
"Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.",
107-
"Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.",
108-
"Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.",
106+
"Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated and are expected to be removed in a future version.",
107+
"Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated and are expected to be removed in a future version.",
108+
"Warning: Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated and are expected to be removed in a future version.",
109109
]
110110

111111
for i in range(self.num_nodes):

0 commit comments

Comments
 (0)