Skip to content

Commit f0dc850

Browse files
committed
[wallet] Remove wallet account RPCs
Also remove the RPC deprecation tests for accounts, and make one small change to another wallet test that relies on account behaviour.
1 parent c410f41 commit f0dc850

File tree

6 files changed

+70
-757
lines changed

6 files changed

+70
-757
lines changed

src/rpc/client.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,11 @@ static const CRPCConvertParam vRPCConvertParams[] =
4040
{ "settxfee", 0, "amount" },
4141
{ "sethdseed", 0, "newkeypool" },
4242
{ "getreceivedbyaddress", 1, "minconf" },
43-
{ "getreceivedbyaccount", 1, "minconf" },
4443
{ "getreceivedbylabel", 1, "minconf" },
4544
{ "listreceivedbyaddress", 0, "minconf" },
4645
{ "listreceivedbyaddress", 1, "include_empty" },
4746
{ "listreceivedbyaddress", 2, "include_watchonly" },
4847
{ "listreceivedbyaddress", 3, "address_filter" },
49-
{ "listreceivedbyaccount", 0, "minconf" },
50-
{ "listreceivedbyaccount", 1, "include_empty" },
51-
{ "listreceivedbyaccount", 2, "include_watchonly" },
5248
{ "listreceivedbylabel", 0, "minconf" },
5349
{ "listreceivedbylabel", 1, "include_empty" },
5450
{ "listreceivedbylabel", 2, "include_watchonly" },
@@ -59,15 +55,9 @@ static const CRPCConvertParam vRPCConvertParams[] =
5955
{ "waitforblockheight", 1, "timeout" },
6056
{ "waitforblock", 1, "timeout" },
6157
{ "waitfornewblock", 0, "timeout" },
62-
{ "move", 2, "amount" },
63-
{ "move", 3, "minconf" },
64-
{ "sendfrom", 2, "amount" },
65-
{ "sendfrom", 3, "minconf" },
6658
{ "listtransactions", 1, "count" },
6759
{ "listtransactions", 2, "skip" },
6860
{ "listtransactions", 3, "include_watchonly" },
69-
{ "listaccounts", 0, "minconf" },
70-
{ "listaccounts", 1, "include_watchonly" },
7161
{ "walletpassphrase", 1, "timeout" },
7262
{ "getblocktemplate", 0, "template_request" },
7363
{ "listsinceblock", 1, "target_confirmations" },

src/wallet/rpcdump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
11501150
" \"keys\": [\"<key>\", ... ] , (array, optional) Array of strings giving private keys whose corresponding public keys must occur in the output or redeemscript\n"
11511151
" \"internal\": <true> , (boolean, optional, default: false) Stating whether matching outputs should be treated as not incoming payments\n"
11521152
" \"watchonly\": <true> , (boolean, optional, default: false) Stating whether matching outputs should be considered watched even when they're not spendable, only allowed if keys are empty\n"
1153-
" \"label\": <label> , (string, optional, default: '') Label to assign to the address (aka account name, for now), only allowed with internal=false\n"
1153+
" \"label\": <label> , (string, optional, default: '') Label to assign to the address, only allowed with internal=false\n"
11541154
" }\n"
11551155
" ,...\n"
11561156
" ]\n"

0 commit comments

Comments
 (0)