diff options
| author | John Newbery <john@johnnewbery.com> | 2018-02-02 14:41:41 -0500 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2018-02-08 08:59:28 -0500 |
| commit | db1cbcc8563722500856df6dea552d51464d173e (patch) | |
| tree | 75f88977f335c4940dde138d05dcadec39d1bf9c | |
| parent | cb28a0b07f889a327731a86d7c13681c3007437f (diff) | |
| download | bitcoin-db1cbcc8563722500856df6dea552d51464d173e.tar.xz | |
[RPC] Remove deprecated addmultisigaddress return format
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index bb0106b543..afad696154 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1192,10 +1192,6 @@ UniValue addmultisigaddress(const JSONRPCRequest& request) " \"address\":\"multisigaddress\", (string) The value of the new multisig address.\n" " \"redeemScript\":\"script\" (string) The string value of the hex-encoded redemption script.\n" "}\n" - "\nResult (DEPRECATED. To see this result in v0.16 instead, please start bitcoind with -deprecatedrpc=addmultisigaddress).\n" - " clients should transition to the new output api before upgrading to v0.17.\n" - "\"address\" (string) A bitcoin address associated with the keys.\n" - "\nExamples:\n" "\nAdd a multisig address from 2 addresses\n" + HelpExampleCli("addmultisigaddress", "2 \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") + @@ -1238,11 +1234,6 @@ UniValue addmultisigaddress(const JSONRPCRequest& request) CTxDestination dest = pwallet->AddAndGetDestinationForScript(inner, output_type); pwallet->SetAddressBook(dest, strAccount, "send"); - // Return old style interface - if (IsDeprecatedRPCEnabled("addmultisigaddress")) { - return EncodeDestination(dest); - } - UniValue result(UniValue::VOBJ); result.pushKV("address", EncodeDestination(dest)); result.pushKV("redeemScript", HexStr(inner.begin(), inner.end())); |