highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 06:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

doc: unify datacarriersize warning with release notes

Browse Source 
Unified the deprecation warning for the recently deprecated datacarrier[size] options to match the phrasing of release-notes-32406.md.
This commit is contained in:
Lőrinc
2025-08-19 20:34:07 -07:00
parent f5f853d952
commit 2885bd0e1c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@@ -904,7 +904,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
} }
if (args.IsArgSet("-datacarriersize") || args.IsArgSet("-datacarrier")) { 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. // 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.

6
test/functional/mempool_datacarrier.py
View File

@@ -103,9 +103,9 @@ class DataCarrierTest(BitcoinTestFramework):
# Clean shutdown boilerplate due to deprecation # Clean shutdown boilerplate due to deprecation
self.expected_stderr = [ self.expected_stderr = [
"", # node 0 has no deprecated options "", # 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 and are expected to 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. 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.",
] ]
for i in range(self.num_nodes): for i in range(self.num_nodes):