[mempool] Fix relaypriority calculation error #8357

Merged
merged 1 commit into from Sep 27, 2016

Projects

None yet

5 participants

@maiiz
Contributor
maiiz commented Jul 18, 2016 edited

[mempool] Fix relaypriority calculation error

Fixes #8334

@MarcoFalke MarcoFalke changed the title from Update coins.cpp to [Wallet] Fix relaypriority calculation error Jul 18, 2016
@MarcoFalke MarcoFalke added the Wallet label Jul 18, 2016
@maiiz
Contributor
maiiz commented Jul 18, 2016

I‘m so sorry ! for this pull request, I try three times.

@MarcoFalke
Member

No worries. There is always bitcoin-core-dev on freenode. We are happy to help with git issues.

@maiiz
Contributor
maiiz commented Jul 18, 2016

@MarcoFalke thanks, and how can i delete the two closed pull request i created before?

@laanwj
Member
laanwj commented Jul 18, 2016

and how can i delete the two closed pull request i created before?

Only github admins can delete pull requests, but don't worry about them.

@maiiz
Contributor
maiiz commented Jul 18, 2016

@laanwj Thank you for your reply.

@MarcoFalke
Member

@maiiz You can still try to adjust the commit message locally (with git)

git clone $yourrepo
cd $yourrepo
git checkout maiiz-patch-1
git commit --amend
git push origin maiiz-patch-1 -f
@maiiz
Contributor
maiiz commented Aug 29, 2016

@MarcoFalke i change the commit message as you teached!

@MarcoFalke
Member

utACK 11d7cd5

@luke-jr
Member
luke-jr commented Sep 10, 2016

utACK

@luke-jr
Member
luke-jr commented Sep 10, 2016

... although this has nothing to do with the wallet? Commit message should probably be fixed.

@MarcoFalke MarcoFalke added Mempool and removed Wallet labels Sep 11, 2016
@MarcoFalke MarcoFalke changed the title from [Wallet] Fix relaypriority calculation error to [CCoinsViewCache] Fix relaypriority calculation error Sep 11, 2016
@MarcoFalke MarcoFalke changed the title from [CCoinsViewCache] Fix relaypriority calculation error to [mempool] Fix relaypriority calculation error Sep 11, 2016
@maiiz
Contributor
maiiz commented Sep 13, 2016

@luke-jr should i change the commit message again?
change like this?

[wallet] Fix relaypriority calculation error -> [mempool] Fix relaypriority calculation error 
@MarcoFalke
Member

@maiiz Sorry for the confusion: I think the mempool, miner and wallet use this logic, but each have the code copied and this bug can only be found in one of the instances... You can remove the tag altogether from the commit message just to be safe.

@gmaxwell
Member

utACK

@MarcoFalke
Member

utACK 94a34a5

@laanwj laanwj merged commit 94a34a5 into bitcoin:master Sep 27, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@laanwj laanwj added a commit that referenced this pull request Sep 27, 2016
@laanwj laanwj Merge #8357: [mempool] Fix relaypriority calculation error
94a34a5 Fix relaypriority calculation error (maiiz)
e9d5f6f
@luke-jr luke-jr referenced this pull request Oct 25, 2016
Merged

0.13.2 backports #9011

@laanwj laanwj added a commit to laanwj/bitcoin that referenced this pull request Oct 25, 2016
@maiiz @laanwj maiiz + laanwj Fix relaypriority calculation error
Github-Pull: #8357
Rebased-From: 94a34a5
000b663
@laanwj laanwj added a commit to laanwj/bitcoin that referenced this pull request Oct 27, 2016
@maiiz @laanwj maiiz + laanwj Fix relaypriority calculation error
Github-Pull: #8357
Rebased-From: 94a34a5
ce0d817
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment