Simplify feebumper minimum fee code slightly #10455

pull ryanofsky wants to merge 1 commits into bitcoin:master from ryanofsky:pr/bumpmin changing 5 files +12 −17

ryanofsky commented at 2:19 PM on May 25, 2017: member

No change in behavior. Get rid of specifiedConfirmTarget if/else block and rename specifiedConfirmTarget and ignoreUserSetFee variables to ignoreGlobalPayTxFee.

Simplify feebumper minimum fee code slightly

No change in behavior. Get rid of specifiedConfirmTarget if/else block and
rename specifiedConfirmTarget and ignoreUserSetFee variables to
ignoreGlobalPayTxFee.

88b8f0b682

dcousens approved

in src/wallet/rpcwallet.cpp:2857 in d222a9984c outdated

2850 | @@ -2851,7 +2851,7 @@ UniValue bumpfee(const JSONRPCRequest& request)
2851 |          if (options.exists("confTarget") && options.exists("totalFee")) {
2852 |              throw JSONRPCError(RPC_INVALID_PARAMETER, "confTarget and totalFee options should not both be set. Please provide either a confirmation target for fee estimation or an explicit total fee for the transaction.");
2853 |          } else if (options.exists("confTarget")) {
2854 | -            specifiedConfirmTarget = true;
2855 | +            ignoreGlobalPayTxFee = true;

morcos commented at 3:27 PM on May 25, 2017:

Can you add a comment here like: "If the user has explicitly set a confTarget in this rpc call then override the default logic that uses the global payTxFee instead of tx confirmation target if a payTxFee is set"

ryanofsky commented at 3:46 PM on May 25, 2017:

Added in 4f5181f32737e532927f626c98b9a5f411370ee9

morcos commented at 3:28 PM on May 25, 2017: member

utACK thanks
ryanofsky force-pushed on May 25, 2017
ryanofsky commented at 3:48 PM on May 25, 2017: member

Squashed 4f5181f32737e532927f626c98b9a5f411370ee9 -> 88b8f0b682271195d20c097660c8e7d4d19e4e44 (pr/bumpmin.2 -> pr/bumpmin.3).
jonasschnelli commented at 6:27 PM on May 25, 2017: contributor

Make much more sense like this. utACK 88b8f0b682271195d20c097660c8e7d4d19e4e44
jonasschnelli added the label Refactoring on May 25, 2017
jonasschnelli added the label Wallet on May 25, 2017
sdaftuar commented at 6:41 PM on May 25, 2017: member

utACK 88b8f0b
TheBlueMatt commented at 2:52 PM on June 1, 2017: member

utACK 88b8f0b682271195d20c097660c8e7d4d19e4e44
paveljanik commented at 12:18 PM on June 2, 2017: contributor

utACK 88b8f0b
laanwj merged this on Jun 5, 2017
laanwj closed this on Jun 5, 2017
laanwj referenced this in commit 0747d33498 on Jun 5, 2017
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels