Skip to content

Commit 4636958

Browse files
committed
Merge bitcoin/bitcoin#33224: doc: unify datacarriersize warning with release notes
2885bd0 doc: unify `datacarriersize` warning with release notes (Lőrinc) Pull request description: Follow-up to bitcoin/bitcoin#32406 --- The [release notes](https://github.com/bitcoin/bitcoin/blob/a189d636184b1c28fa4a325b56c1fab8f44527b1/doc/release-notes-32406.md#L1) claim > [...] marked as deprecated and are expected to be removed in a future release but the [warning itself](https://github.com/bitcoin/bitcoin/blob/2885bd0e1c4fc863a7f28ff0fd353f5cffb03442/src/init.cpp#L907) claims > [...] marked as deprecated. They **will** be removed in a future version. To be less aggressive (since some have objected against this version online) - and to unify the deprecation warning with the release notes - I have changed the warning to communicate our expectation in a friendlier way. ACKs for top commit: cedwies: ACK 2885bd0 ryanofsky: Code review ACK 2885bd0. I don't think it is good for the release notes and the runtime warning message to say two different things. I'd also be happy if release notes were updated to match the runtime warning, instead of vice versa. Whatever is more accurate is better. ajtowns: ACK 2885bd0 kevkevinpal: ACK [2885bd0](bitcoin/bitcoin@2885bd0) achow101: ACK 2885bd0 janb84: ACK 2885bd0 Zero-1729: crACK 2885bd0 jonatack: ACK 2885bd0 hodlinator: ACK 2885bd0 w0xlt: ACK bitcoin/bitcoin@2885bd0 optout21: ACK 2885bd0 Tree-SHA512: a9d2a64ab96b3dd7f3a1a29622930054fd5c56e573bc96330f4ef3327dc024b21b3fbc8a698d17aea7c76f57f0c2ccd6403b2df344ae2f69c645ceb8b6fa54a5
2 parents 7e58c94 + 2885bd0 commit 4636958

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)