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

@fanquake
Copy link
Member

@fanquake fanquake commented Jan 17, 2019

Also added optional to iscompressed.

@promag
Copy link
Member

@promag promag commented Jan 17, 2019

ACK, nice catch.

@fanquake fanquake force-pushed the duplicate-solvable-fields branch from 99a1b7b to a5db68c Jan 17, 2019
@fanquake
Copy link
Member Author

@fanquake fanquake commented Jan 17, 2019

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

@laanwj
Copy link
Member

@laanwj laanwj commented Jan 17, 2019

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

(utACK, good catch)

@Empact
Copy link
Member

@Empact Empact commented Jan 17, 2019

utACK a5db68c

@hebasto
Copy link
Member

@hebasto hebasto commented Jan 17, 2019

utACK a5db68c22ba03e661d20b1855e6a443019080690

@promag
Copy link
Member

@promag promag commented Jan 17, 2019

Should backport?

@fanquake
Copy link
Member Author

@fanquake fanquake 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)

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

@MarcoFalke MarcoFalke commented Jan 17, 2019

ACK

@achow101
Copy link
Member

@achow101 achow101 commented Jan 17, 2019

utACK a5db68c22ba03e661d20b1855e6a443019080690

@fanquake fanquake force-pushed the duplicate-solvable-fields branch from a5db68c to a2a6c8f Jan 18, 2019
@IlyasRidhuan
Copy link

@IlyasRidhuan IlyasRidhuan commented Jan 18, 2019

utAck

@laanwj laanwj merged commit a2a6c8f into bitcoin:master Jan 19, 2019
2 checks passed
laanwj added a commit that referenced this issue Jan 19, 2019
a2a6c8f rpc: remove duplicate solvable field from getaddressinfo (fanquake)

Pull request description:

  Also added optional to `iscompressed`.

Tree-SHA512: 28442a9dbfb2a9992b9b57142fa13d374d39444f04ae63460cb6330d896160cfd4b9651a3e231893eac3142ce55eff597a54cbafd3b57ffa46d3711c64044acb
@fanquake fanquake deleted the 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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants