diff options
author | fanquake <fanquake@gmail.com> | 2021-12-28 20:22:28 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-12-28 20:22:38 +0800 |
commit | bb655a6aac93e41005b6ad2ca98000cc07aa8119 (patch) | |
tree | d26309d1d028ab95877c8bef5c0548bb345128ad | |
parent | 45249e70d993f5162c9ae47d6f0755974228425c (diff) | |
parent | fa562fdd5e36566f8013eee17c6dbf830942094e (diff) | |
download | bitcoin-bb655a6aac93e41005b6ad2ca98000cc07aa8119.tar.xz |
Merge bitcoin/bitcoin#23883: doc: Remove fixed TODO from wallet/feebumper
fa562fdd5e36566f8013eee17c6dbf830942094e doc: Remove fixed TODO from wallet/feebumper (MarcoFalke)
Pull request description:
Fixed in commit 9522b53a91f28032c34b94662d50b000534708ce
ACKs for top commit:
shaavan:
ACK fa562fdd5e36566f8013eee17c6dbf830942094e
Tree-SHA512: 968fda0994020c369b7acfc01db109d0f50d4c137fadf533ae55d0e14a353ebbde4320e798cf89e5489f1020c459712631b3967976c1f73d99db8a2d1cbad982
-rw-r--r-- | src/wallet/feebumper.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index f2de68295e..57edba4c7d 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -276,10 +276,6 @@ Result CommitTransaction(CWallet& wallet, const uint256& txid, CMutableTransacti // mark the original tx as bumped bumped_txid = tx->GetHash(); if (!wallet.MarkReplaced(oldWtx.GetHash(), bumped_txid)) { - // TODO: see if JSON-RPC has a standard way of returning a response - // along with an exception. It would be good to return information about - // wtxBumped to the caller even if marking the original transaction - // replaced does not succeed for some reason. errors.push_back(Untranslated("Created new bumpfee transaction but could not mark the original transaction as replaced")); } return Result::OK; |