aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/client.cpp
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-10-24 08:09:11 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-10-24 08:09:48 -0400
commit9dda5fdf64ca07079a9bd6d3102d281074a9a912 (patch)
tree0319936008c6458d4d08f05d19dff4c76f73a40f /src/rpc/client.cpp
parente895fdc9fc83a35fc279b770b46c89e137e11128 (diff)
parent2b91e42ece78c3f2ae4bf12fa71f461d05426a19 (diff)
downloadbitcoin-9dda5fdf64ca07079a9bd6d3102d281074a9a912.tar.xz
Merge #14296: [wallet] Remove addwitnessaddress
2b91e42ece [docs] Add release note for removing getwitnessaddress (John Newbery) ebec90ac97 [wallet] Remove deprecated addwitnessaddress RPC method (John Newbery) 07e3f585ab [test] Remove deprecated addwitnessaddress from feature_segwit.py (John Newbery) 82f2fa03a5 [test] Remove deprecated addwitnessaddress from wallet_bumpfee.py (John Newbery) 9d7ee187a3 [test] Remove deprecated addwitnessaddress from p2p_compactblocks.py (John Newbery) 3cf77f0b3e [tests] Remove deprecated addwitnessaddress call from wallet_dump.py (John Newbery) bdefc9705d [tests] Remove deprecated addwitnessaddress call from feature_nulldummy (John Newbery) 67d7d67cf3 [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
Diffstat (limited to 'src/rpc/client.cpp')
-rw-r--r--src/rpc/client.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 2bf6aa3b76..a550f693e6 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -147,7 +147,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "logging", 0, "include" },
{ "logging", 1, "exclude" },
{ "disconnectnode", 1, "nodeid" },
- { "addwitnessaddress", 1, "p2sh" },
// Echo with conversion (For testing only)
{ "echojson", 0, "arg0" },
{ "echojson", 1, "arg1" },