Skip to content

Commit f9650e1

Browse files
committed
rbf: remove unecessary newline at end of error string
1 parent 221c789 commit f9650e1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: src/policy/rbf.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ std::optional<std::string> GetEntriesForConflicts(const CTransaction& tx,
7171
// descendants (i.e. if multiple conflicts share a descendant, it will be counted multiple
7272
// times), but we just want to be conservative to avoid doing too much work.
7373
if (nConflictingCount > MAX_REPLACEMENT_CANDIDATES) {
74-
return strprintf("rejecting replacement %s; too many potential replacements (%d > %d)\n",
74+
return strprintf("rejecting replacement %s; too many potential replacements (%d > %d)",
7575
txid.ToString(),
7676
nConflictingCount,
7777
MAX_REPLACEMENT_CANDIDATES);

Diff for: test/functional/mempool_package_rbf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def test_package_rbf_max_conflicts(self):
219219
package_child = self.wallet.create_self_transfer(fee_rate=child_feerate, utxo_to_spend=package_parent["new_utxos"][0])
220220

221221
pkg_results = node.submitpackage([package_parent["hex"], package_child["hex"]], maxfeerate=0)
222-
assert_equal(f"package RBF failed: too many potential replacements, rejecting replacement {package_child['tx'].rehash()}; too many potential replacements (102 > 100)\n", pkg_results["package_msg"])
222+
assert_equal(f"package RBF failed: too many potential replacements, rejecting replacement {package_child['tx'].rehash()}; too many potential replacements (102 > 100)", pkg_results["package_msg"])
223223
self.assert_mempool_contents(expected=expected_txns)
224224

225225
# Make singleton tx to conflict with in next batch
@@ -234,7 +234,7 @@ def test_package_rbf_max_conflicts(self):
234234
package_parent = self.wallet.create_self_transfer_multi(utxos_to_spend=double_spending_coins, fee_per_output=parent_fee_per_conflict)
235235
package_child = self.wallet.create_self_transfer(fee_rate=child_feerate, utxo_to_spend=package_parent["new_utxos"][0])
236236
pkg_results = node.submitpackage([package_parent["hex"], package_child["hex"]], maxfeerate=0)
237-
assert_equal(f"package RBF failed: too many potential replacements, rejecting replacement {package_child['tx'].rehash()}; too many potential replacements (101 > 100)\n", pkg_results["package_msg"])
237+
assert_equal(f"package RBF failed: too many potential replacements, rejecting replacement {package_child['tx'].rehash()}; too many potential replacements (101 > 100)", pkg_results["package_msg"])
238238
self.assert_mempool_contents(expected=expected_txns)
239239

240240
# Finally, evict MAX_REPLACEMENT_CANDIDATES

0 commit comments

Comments
 (0)