[trivial] Fix error messages in CFeeBumper #11597
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
promag
reviewed
Nov 3, 2017
src/wallet/feebumper.cpp
Outdated
| 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()))); | ||
| vErrors.push_back(strprintf( | ||
| "New fee rate (%s) is lower than the minimum fee rate (%s) to get into the mempool. " | ||
| "The totalFee value should be at least %s or the settxfee value should be at least %s to add transaction.", |
There was a problem hiding this comment.
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"
There was a problem hiding this comment.
My suggestion included replacing the inner period with -
kallewoof
force-pushed
the
171102-feebumper-lowerfeetxt
branch
from
2c83c51
to
67a6298
Compare
kallewoof
changed the title
kallewoof
force-pushed
the
171102-feebumper-lowerfeetxt
branch
from
67a6298
to
a163407
Compare
|
utACK a16340758e3aa2a73a8b594eeb5fae7f81f9eea1 |
promag
reviewed
Nov 3, 2017
src/wallet/feebumper.cpp
Outdated
| @@ -284,7 +290,7 @@ bool CFeeBumper::commit(CWallet *pWallet) | |||
| // 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. | |||
| vErrors.push_back("Error: Created new bumpfee transaction but could not mark the original transaction as replaced."); | |||
| vErrors.push_back("Error: Created new bumpfee transaction but could not mark the original transaction as replaced"); | |||
There was a problem hiding this comment.
BTW, is there a reason to have these Error: prefixes?
There was a problem hiding this comment.
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.
kallewoof
force-pushed
the
171102-feebumper-lowerfeetxt
branch
from
a163407
to
28eabb0
Compare
promag
reviewed
Nov 3, 2017
src/wallet/feebumper.cpp
Outdated
| @@ -267,15 +273,15 @@ bool CFeeBumper::commit(CWallet *pWallet) | |||
| CValidationState state; | |||
| if (!pWallet->CommitTransaction(wtxBumped, reservekey, g_connman.get(), state)) { | |||
| // NOTE: CommitTransaction never returns false, so this should never happen. | |||
| vErrors.push_back(strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason())); | |||
| vErrors.push_back(strprintf("The transaction was rejected! Reason given: %s", state.GetRejectReason())); | |||
There was a problem hiding this comment.
nit, follow format below (replace ! by :), check others.
kallewoof
force-pushed
the
171102-feebumper-lowerfeetxt
branch
from
28eabb0
to
a02c5e4
Compare
|
utACK a02c5e4 |
|
utACK a02c5e4 |
maflcko
pushed a commit
that referenced
this pull request
Nov 7, 2017
a02c5e4 [trivial] Fix error messages in CFeeBumper (Karl-Johan Alm) Pull request description: …pool fee rate. Tree-SHA512: c179853b2a19fdb767e46b29068f3e1ce6db75fda4356746472c93c5b51f0aa495a988c4da1e14762993d57229e525594a2e9d0e089f931c1c67fec7807bda54
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…pool fee rate.