Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct constant to HIGH_MAX_TX_FEE #517

Merged
merged 1 commit into from
May 8, 2017
Merged

Correct constant to HIGH_MAX_TX_FEE #517

merged 1 commit into from
May 8, 2017

Conversation

kyuupichan
Copy link
Contributor

I noticed HIGH_MAX_TX_FEE is unused. There was probably an incorrect
merge conflict resolution done previously; restore to the correct constant.

I noticed HIGH_MAX_TX_FEE is unused.  There was probably an incorrect
merge conflict resolution done previously; restore to the correct constant.
@sickpig
Copy link
Collaborator

sickpig commented May 5, 2017

All failure of the latest bunch of PRs (at least from #509 and up) is due to timeout on validateblockteplate.py, see: https://travis-ci.org/BitcoinUnlimited/BitcoinUnlimited/jobs/228881035#L3499

It seems that the failure is due to PR 455. Testing dev with such PR reverted fix the problem.

Copy link
Collaborator

@ftrader ftrader left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code change looks correct to me w.r.t. the definitions (HIGH_MAX_TX_FEE = 100 * HIGH_TX_FEE_PER_KB)

@gandrewstone
Copy link
Collaborator

its pretty clear in all other portions of the code that maxTxFee.value is not used per-KB...

@gandrewstone gandrewstone merged commit 5b59927 into BitcoinUnlimited:dev May 8, 2017
@kyuupichan kyuupichan deleted the high-max-tx-fee branch May 10, 2017 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants