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

[wallet] Remove addwitnessaddress #14296

Merged
merged 8 commits into from Oct 24, 2018

Conversation

@jnewbery
Copy link
Member

@jnewbery jnewbery commented Sep 23, 2018

Fully removes the addwitnessaddress RPC method, which was deprecated in V0.17

@jnewbery jnewbery changed the title Remove addwitnessaddress [wallet] Remove addwitnessaddress Sep 23, 2018
@ken2812221
Copy link
Contributor

@ken2812221 ken2812221 commented Sep 23, 2018

Concept ACK

jnewbery added 7 commits Sep 23, 2018
Fix all flake8 warnings in tests that are about to be updated
to remove addwitnessaddress
addwitnessaddress is deprecated. Replace the call to addwitnessaddress
with a call to getnewaddress(address_type='p2sh-segwit')
addwitnessaddress is deprecated. Remove the call to that RPC from
wallet_dump.py and improve testing of all types of address (legacy,
p2sh-segwit and bech32)
@jnewbery jnewbery force-pushed the remove_addwitnessaddress branch from e70b870 to 850908a Sep 23, 2018
@jnewbery
Copy link
Member Author

@jnewbery jnewbery commented Sep 23, 2018

Travis was failing because of new flake8 warnings. I've added a new commit removing all flake8 warnings from touched tests.

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Sep 23, 2018

Reviewers, this pull request conflicts with the following ones:
  • #14534 (Enable flake8 rule E225 which checks for missing whitespace around op… by jbampton)
  • #14502 (Rpc help helper class by karel-3d)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Sep 28, 2018

Coverage Change (pull 14296) Reference (master)
Lines -0.0326 % 87.0361 %
Functions +0.1317 % 84.1130 %
Branches -0.0485 % 51.5451 %

Copy link
Member

@promag promag left a comment

Tested ACK 850908a, some comments though.

nit, commit ebec90a prefix could be rpc — doesn't touch wallet code?

addwitnessaddress RPC method removed
------------------------------------

The `addwitnessaddress` RPC was added for segwit testing in version 0.13.1. It
Copy link
Member

@promag promag Oct 2, 2018

From doc/release-notes/release-notes-0.13.0.md

  • New RPC commands: generatetoaddress, importprunedfunds, removeprunedfunds, signmessagewithprivkey,
    getmempoolancestors, getmempooldescendants, getmempoolentry,
    createwitnessaddress, addwitnessaddress.

Copy link
Member Author

@jnewbery jnewbery Oct 17, 2018

fixed

------------------------------------

The `addwitnessaddress` RPC was added for segwit testing in version 0.13.1. It
was deprecated in version 0.17.0. This version fully removes the RPC method.
Copy link
Member

@promag promag Oct 2, 2018

From doc/release-notes/release-notes-0.16.0.md

  • The wallet RPC addwitnessaddress was deprecated and will be removed in version 0.17,

Copy link
Member Author

@jnewbery jnewbery Oct 17, 2018

fixed

@jnewbery jnewbery force-pushed the remove_addwitnessaddress branch from 850908a to 2b91e42 Oct 17, 2018
@jnewbery
Copy link
Member Author

@jnewbery jnewbery commented Oct 17, 2018

Thanks for the corrections @promag . I've fixed them both.

@sipa
Copy link
Member

@sipa sipa commented Oct 17, 2018

utACK 2b91e42

@promag
Copy link
Member

@promag promag commented Oct 18, 2018

Tested ACK 2b91e42, only change was fixing release notes.

@DrahtBot DrahtBot mentioned this pull request Oct 20, 2018
@MarcoFalke MarcoFalke merged commit 2b91e42 into bitcoin:master Oct 24, 2018
2 checks passed
MarcoFalke added a commit that referenced this issue Oct 24, 2018
2b91e42 [docs] Add release note for removing getwitnessaddress (John Newbery)
ebec90a [wallet] Remove deprecated addwitnessaddress RPC method (John Newbery)
07e3f58 [test] Remove deprecated addwitnessaddress from feature_segwit.py (John Newbery)
82f2fa0 [test] Remove deprecated addwitnessaddress from wallet_bumpfee.py (John Newbery)
9d7ee18 [test] Remove deprecated addwitnessaddress from p2p_compactblocks.py (John Newbery)
3cf77f0 [tests] Remove deprecated addwitnessaddress call from wallet_dump.py (John Newbery)
bdefc97 [tests] Remove deprecated addwitnessaddress call from feature_nulldummy (John Newbery)
67d7d67 [test] Fix flake8 warnings in tests (John Newbery)

Pull request description:

  Fully removes the `addwitnessaddress` RPC method, which was deprecated in V0.17

Tree-SHA512: 8fa8a2a721a81262fbdedbe1cef031e6a07aa6abbc9760dbc62738fc4f688b44bd737d0f3cdb1aec046866a6395befbfecde0f34e76a99e11d3cf566cad1d0de
@jnewbery jnewbery deleted the remove_addwitnessaddress branch Oct 24, 2018
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants