Skip to content

Commit bb655a6

Browse files
committed
Merge bitcoin/bitcoin#23883: doc: Remove fixed TODO from wallet/feebumper
fa562fd doc: Remove fixed TODO from wallet/feebumper (MarcoFalke) Pull request description: Fixed in commit 9522b53 ACKs for top commit: shaavan: ACK fa562fd Tree-SHA512: 968fda0994020c369b7acfc01db109d0f50d4c137fadf533ae55d0e14a353ebbde4320e798cf89e5489f1020c459712631b3967976c1f73d99db8a2d1cbad982
2 parents 45249e7 + fa562fd commit bb655a6

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/wallet/feebumper.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,6 @@ Result CommitTransaction(CWallet& wallet, const uint256& txid, CMutableTransacti
276276
// mark the original tx as bumped
277277
bumped_txid = tx->GetHash();
278278
if (!wallet.MarkReplaced(oldWtx.GetHash(), bumped_txid)) {
279-
// TODO: see if JSON-RPC has a standard way of returning a response
280-
// along with an exception. It would be good to return information about
281-
// wtxBumped to the caller even if marking the original transaction
282-
// replaced does not succeed for some reason.
283279
errors.push_back(Untranslated("Created new bumpfee transaction but could not mark the original transaction as replaced"));
284280
}
285281
return Result::OK;

0 commit comments

Comments
 (0)