Page MenuHomePhabricator

Merge #10431: Prevent shadowing the global dustRelayFee
AcceptedPublic

Authored by nakihito on Tue, May 14, 01:46.

Details

Reviewers
deadalnix
Fabien
jasonbcox
markblundeberg
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Restricted Project
Summary

43c5877 Prevent shadowing the global dustRelayFee. (Pavel Janík)

Tree-SHA512: 9765931a7753c484990003396afd0bb65a53f42d1cad9502017720618ce90b3c5ae68591db01e3524adecdbe6925a5eeeebf04012ba644ef3b65073af207ae5d

Backport of Core PR10431
https://github.com/bitcoin/bitcoin/pull/10431/

Depends on D3039

Test Plan
make check
test_runner.py

Diff Detail

Repository
rABC Bitcoin ABC
Branch
PR10431
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 5841
Build 9744: Bitcoin ABC Teamcity Staging
Build 9743: arc lint + arc unit

Event Timeline

nakihito created this revision.Tue, May 14, 01:46
Owners added a reviewer: Restricted Owners Package.Tue, May 14, 01:46
Herald added a reviewer: Restricted Project. · View Herald TranscriptTue, May 14, 01:46
nakihito edited the test plan for this revision. (Show Details)EditedTue, May 14, 01:47

The warnings core had don't actually occur in our code base because of some other changes made before (we don't need to use the global dustRelayFee). However, renaming the arguments should help to prevent some confusion and will hopefully keep merge conflicts in future backports to a minimum.

Fabien accepted this revision.Tue, May 14, 09:56

I get the warnings, which compiler do you use ?

This revision is now accepted and ready to land.Tue, May 14, 09:56
In D3040#71594, @Fabien wrote:

I get the warnings, which compiler do you use ?

Ah, I'm getting them again on the D3039 branch. I may have just missed them last time or wasn't doing a clean build.