[trivial] Fix error messages in CFeeBumper #11597

pull kallewoof wants to merge 1 commits into bitcoin:master from kallewoof:171102-feebumper-lowerfeetxt changing 1 files +10 −4
  1. kallewoof commented at 6:30 PM on November 2, 2017: member

    …pool fee rate.

  2. MarcoFalke added the label Docs and Output on Nov 2, 2017
  3. in src/wallet/feebumper.cpp:201 in 2c83c511dc outdated
     195 | @@ -196,7 +196,13 @@ CFeeBumper::CFeeBumper(const CWallet *pWallet, const uint256 txidIn, const CCoin
     196 |      // moment earlier. In this case, we report an error to the user, who may use totalFee to make an adjustment.
     197 |      CFeeRate minMempoolFeeRate = mempool.GetMinFee(gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000);
     198 |      if (nNewFeeRate.GetFeePerK() < minMempoolFeeRate.GetFeePerK()) {
     199 | -        vErrors.push_back(strprintf("New fee rate (%s) is less than the minimum fee rate (%s) to get into the mempool. totalFee value should to be at least %s or settxfee value should be at least %s to add transaction.", FormatMoney(nNewFeeRate.GetFeePerK()), FormatMoney(minMempoolFeeRate.GetFeePerK()), FormatMoney(minMempoolFeeRate.GetFee(maxNewTxSize)), FormatMoney(minMempoolFeeRate.GetFeePerK())));
     200 | +        vErrors.push_back(strprintf(
     201 | +            "New fee rate (%s) is lower than the minimum fee rate (%s) to get into the mempool. "
     202 | +            "The totalFee value should be at least %s or the settxfee value should be at least %s to add transaction.",
    


    promag commented at 10:41 AM on November 3, 2017:

    Nit, there are only 2 error messages with periods, this one and: https://github.com/bitcoin/bitcoin/blob/2c83c511dcda98550b660f6b62da7fab8548ca5c/src/wallet/feebumper.cpp#L293 How about removing the period in the last one and here: "New fee rate ... - the totalFee value should ... to add transaction"


    kallewoof commented at 6:25 PM on November 3, 2017:

    Sounds good -- done.


    promag commented at 6:29 PM on November 3, 2017:

    My suggestion included replacing the inner period with -

  4. promag commented at 10:42 AM on November 3, 2017: member

    Concept ACK.

    Nit, reword PR and commit to Fix error messages in CFeeBumper.

  5. kallewoof force-pushed on Nov 3, 2017
  6. kallewoof renamed this:
    [trivial] Fix error message & styling for when new fee rate < min mem…
    [trivial] Fix error messages in CFeeBumper
    on Nov 3, 2017
  7. kallewoof force-pushed on Nov 3, 2017
  8. TheBlueMatt commented at 9:51 PM on November 3, 2017: member

    utACK a16340758e3aa2a73a8b594eeb5fae7f81f9eea1

  9. in src/wallet/feebumper.cpp:293 in a16340758e outdated
     289 | @@ -284,7 +290,7 @@ bool CFeeBumper::commit(CWallet *pWallet)
     290 |          // along with an exception. It would be good to return information about
     291 |          // wtxBumped to the caller even if marking the original transaction
     292 |          // replaced does not succeed for some reason.
     293 | -        vErrors.push_back("Error: Created new bumpfee transaction but could not mark the original transaction as replaced.");
     294 | +        vErrors.push_back("Error: Created new bumpfee transaction but could not mark the original transaction as replaced");
    


    promag commented at 10:09 PM on November 3, 2017:

    BTW, is there a reason to have these Error: prefixes?


    kallewoof commented at 10:15 PM on November 3, 2017:

    Good point. Seems to be used only in a few places. I am going to remove the Error: prefix in the 3 locations it's used.

  10. promag commented at 10:10 PM on November 3, 2017: member

    utACK a163407.

  11. kallewoof force-pushed on Nov 3, 2017
  12. in src/wallet/feebumper.cpp:276 in 28eabb003b outdated
     272 | @@ -267,15 +273,15 @@ bool CFeeBumper::commit(CWallet *pWallet)
     273 |      CValidationState state;
     274 |      if (!pWallet->CommitTransaction(wtxBumped, reservekey, g_connman.get(), state)) {
     275 |          // NOTE: CommitTransaction never returns false, so this should never happen.
     276 | -        vErrors.push_back(strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason()));
     277 | +        vErrors.push_back(strprintf("The transaction was rejected! Reason given: %s", state.GetRejectReason()));
    


    promag commented at 10:22 PM on November 3, 2017:

    :trollface:nit, follow format below (replace ! by :), check others.


    kallewoof commented at 10:38 PM on November 3, 2017:

    lol.. fixed, thanks.

  13. promag commented at 10:22 PM on November 3, 2017: member

    utACK 28eabb0.

  14. [trivial] Fix error messages in CFeeBumper a02c5e459a
  15. kallewoof force-pushed on Nov 3, 2017
  16. jonasschnelli commented at 10:19 PM on November 5, 2017: contributor

    utACK a02c5e459a1e27e3c2ca7206ee703bccca126ff9

  17. fanquake commented at 12:20 PM on November 6, 2017: member

    utACK a02c5e4

  18. MarcoFalke merged this on Nov 7, 2017
  19. MarcoFalke closed this on Nov 7, 2017

  20. MarcoFalke referenced this in commit 6f01dcf638 on Nov 7, 2017
  21. kallewoof deleted the branch on Oct 17, 2019
  22. DrahtBot locked this on Dec 16, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-14 18:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me