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

rpc: remove duplicate solvable field from getaddressinfo #15186

Merged
merged 1 commit into from Jan 19, 2019

Conversation

Projects
None yet
8 participants
@fanquake
Copy link
Member

commented Jan 17, 2019

Also added optional to iscompressed.

@promag

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

ACK, nice catch.

@fanquake fanquake force-pushed the fanquake:duplicate-solvable-fields branch Jan 17, 2019

@fanquake

This comment has been minimized.

Copy link
Member Author

commented Jan 17, 2019

Travis failure seems unrelated. Force pushed, added optional to iscompressed.

@laanwj

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

Huh, how did we have it end up like this, a silent merge conflict?

(utACK, good catch)

@Empact

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

utACK a5db68c

@hebasto

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

utACK a5db68c22ba03e661d20b1855e6a443019080690

@promag

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

Should backport?

@fanquake

This comment has been minimized.

Copy link
Member Author

commented Jan 17, 2019

@promag getaddressinfo in 0.17 doesn't have any solvable fields, so shouldn't be required.

UniValue getaddressinfo(const JSONRPCRequest& request)

Show resolved Hide resolved src/wallet/rpcwallet.cpp Outdated
@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

ACK

@achow101

This comment has been minimized.

Copy link
Member

commented Jan 17, 2019

utACK a5db68c22ba03e661d20b1855e6a443019080690

@fanquake fanquake force-pushed the fanquake:duplicate-solvable-fields branch to a2a6c8f Jan 18, 2019

@IlyasRidhuan

This comment has been minimized.

Copy link

commented Jan 18, 2019

utAck

@laanwj laanwj merged commit a2a6c8f into bitcoin:master Jan 19, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jan 19, 2019

Merge #15186: rpc: remove duplicate solvable field from getaddressinfo
a2a6c8f rpc: remove duplicate solvable field from getaddressinfo (fanquake)

Pull request description:

  Also added optional to `iscompressed`.

Tree-SHA512: 28442a9dbfb2a9992b9b57142fa13d374d39444f04ae63460cb6330d896160cfd4b9651a3e231893eac3142ce55eff597a54cbafd3b57ffa46d3711c64044acb

@fanquake fanquake deleted the fanquake:duplicate-solvable-fields branch Jan 19, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.