Skip to content

Commit db1cbcc

Browse files
committed
[RPC] Remove deprecated addmultisigaddress return format
1 parent cb28a0b commit db1cbcc

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

src/wallet/rpcwallet.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,10 +1192,6 @@ UniValue addmultisigaddress(const JSONRPCRequest& request)
11921192
" \"address\":\"multisigaddress\", (string) The value of the new multisig address.\n"
11931193
" \"redeemScript\":\"script\" (string) The string value of the hex-encoded redemption script.\n"
11941194
"}\n"
1195-
"\nResult (DEPRECATED. To see this result in v0.16 instead, please start bitcoind with -deprecatedrpc=addmultisigaddress).\n"
1196-
" clients should transition to the new output api before upgrading to v0.17.\n"
1197-
"\"address\" (string) A bitcoin address associated with the keys.\n"
1198-
11991195
"\nExamples:\n"
12001196
"\nAdd a multisig address from 2 addresses\n"
12011197
+ HelpExampleCli("addmultisigaddress", "2 \"[\\\"16sSauSf5pF2UkUwvKGq4qjNRzBZYqgEL5\\\",\\\"171sgjn4YtPu27adkKGrdDwzRTxnRkBfKV\\\"]\"") +
@@ -1238,11 +1234,6 @@ UniValue addmultisigaddress(const JSONRPCRequest& request)
12381234
CTxDestination dest = pwallet->AddAndGetDestinationForScript(inner, output_type);
12391235
pwallet->SetAddressBook(dest, strAccount, "send");
12401236

1241-
// Return old style interface
1242-
if (IsDeprecatedRPCEnabled("addmultisigaddress")) {
1243-
return EncodeDestination(dest);
1244-
}
1245-
12461237
UniValue result(UniValue::VOBJ);
12471238
result.pushKV("address", EncodeDestination(dest));
12481239
result.pushKV("redeemScript", HexStr(inner.begin(), inner.end()));

0 commit comments

Comments
 (0)