aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am22
-rw-r--r--src/bitcoin-cli.cpp4
-rw-r--r--src/bitcoind.cpp3
-rw-r--r--src/httprpc.cpp4
-rw-r--r--src/httpserver.cpp2
-rw-r--r--src/init.cpp2
-rw-r--r--src/qt/bitcoin.cpp2
-rw-r--r--src/qt/rpcconsole.cpp4
-rw-r--r--src/rest.cpp2
-rw-r--r--src/rpc/blockchain.cpp (renamed from src/rpcblockchain.cpp)2
-rw-r--r--src/rpc/client.cpp (renamed from src/rpcclient.cpp)5
-rw-r--r--src/rpc/client.h (renamed from src/rpcclient.h)0
-rw-r--r--src/rpc/mining.cpp (renamed from src/rpcmining.cpp)2
-rw-r--r--src/rpc/misc.cpp (renamed from src/rpcmisc.cpp)2
-rw-r--r--src/rpc/net.cpp (renamed from src/rpcnet.cpp)2
-rw-r--r--src/rpc/protocol.cpp (renamed from src/rpcprotocol.cpp)2
-rw-r--r--src/rpc/protocol.h (renamed from src/rpcprotocol.h)0
-rw-r--r--src/rpc/rawtransaction.cpp (renamed from src/rpcrawtransaction.cpp)2
-rw-r--r--src/rpc/server.cpp (renamed from src/rpcserver.cpp)2
-rw-r--r--src/rpc/server.h (renamed from src/rpcserver.h)10
-rw-r--r--src/test/rpc_tests.cpp6
-rw-r--r--src/test/rpc_wallet_tests.cpp4
-rw-r--r--src/wallet/rpcdump.cpp2
-rw-r--r--src/wallet/rpcwallet.cpp74
24 files changed, 79 insertions, 81 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a104a0148d..b1b8ae123e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,9 +131,9 @@ BITCOIN_CORE_H = \
pubkey.h \
random.h \
reverselock.h \
- rpcclient.h \
- rpcprotocol.h \
- rpcserver.h \
+ rpc/client.h \
+ rpc/protocol.h \
+ rpc/server.h \
scheduler.h \
script/interpreter.h \
script/script.h \
@@ -203,12 +203,12 @@ libbitcoin_server_a_SOURCES = \
policy/policy.cpp \
pow.cpp \
rest.cpp \
- rpcblockchain.cpp \
- rpcmining.cpp \
- rpcmisc.cpp \
- rpcnet.cpp \
- rpcrawtransaction.cpp \
- rpcserver.cpp \
+ rpc/blockchain.cpp \
+ rpc/mining.cpp \
+ rpc/misc.cpp \
+ rpc/net.cpp \
+ rpc/rawtransaction.cpp \
+ rpc/server.cpp \
script/sigcache.cpp \
timedata.cpp \
torcontrol.cpp \
@@ -304,7 +304,7 @@ libbitcoin_util_a_SOURCES = \
compat/glibcxx_sanity.cpp \
compat/strnlen.cpp \
random.cpp \
- rpcprotocol.cpp \
+ rpc/protocol.cpp \
support/cleanse.cpp \
sync.cpp \
uint256.cpp \
@@ -322,7 +322,7 @@ endif
libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_cli_a_SOURCES = \
- rpcclient.cpp \
+ rpc/client.cpp \
$(BITCOIN_CORE_H)
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index fb20521085..d1d534b05e 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -5,8 +5,8 @@
#include "chainparamsbase.h"
#include "clientversion.h"
-#include "rpcclient.h"
-#include "rpcprotocol.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
#include "util.h"
#include "utilstrencodings.h"
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 3b6608c95a..d1fd56d177 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -5,14 +5,13 @@
#include "chainparams.h"
#include "clientversion.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "init.h"
#include "noui.h"
#include "scheduler.h"
#include "util.h"
#include "httpserver.h"
#include "httprpc.h"
-#include "rpcserver.h"
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem.hpp>
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 7ff2586422..432a5c0792 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -7,8 +7,8 @@
#include "base58.h"
#include "chainparams.h"
#include "httpserver.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
+#include "rpc/protocol.h"
+#include "rpc/server.h"
#include "random.h"
#include "sync.h"
#include "util.h"
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 91518d7c5f..ce1accb046 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -8,7 +8,7 @@
#include "compat.h"
#include "util.h"
#include "netbase.h"
-#include "rpcprotocol.h" // For HTTP status codes
+#include "rpc/protocol.h" // For HTTP status codes
#include "sync.h"
#include "ui_interface.h"
diff --git a/src/init.cpp b/src/init.cpp
index a6d26a02f1..3d9b4041c3 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -23,7 +23,7 @@
#include "miner.h"
#include "net.h"
#include "policy/policy.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "script/standard.h"
#include "script/sigcache.h"
#include "scheduler.h"
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index dcf752cc32..b33df45fb9 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -26,7 +26,7 @@
#endif
#include "init.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "scheduler.h"
#include "ui_interface.h"
#include "util.h"
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index dca34ed043..9162642ea8 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -12,8 +12,8 @@
#include "bantablemodel.h"
#include "chainparams.h"
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
#include "util.h"
#include <openssl/crypto.h>
diff --git a/src/rest.cpp b/src/rest.cpp
index ad884dac1c..ebdccc9402 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -9,7 +9,7 @@
#include "primitives/transaction.h"
#include "main.h"
#include "httpserver.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "streams.h"
#include "sync.h"
#include "txmempool.h"
diff --git a/src/rpcblockchain.cpp b/src/rpc/blockchain.cpp
index 954441d15c..de6bda4ea1 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -12,7 +12,7 @@
#include "main.h"
#include "policy/policy.h"
#include "primitives/transaction.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "streams.h"
#include "sync.h"
#include "txmempool.h"
diff --git a/src/rpcclient.cpp b/src/rpc/client.cpp
index 0471580237..b0e9b6f153 100644
--- a/src/rpcclient.cpp
+++ b/src/rpc/client.cpp
@@ -3,9 +3,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "rpcclient.h"
-
-#include "rpcprotocol.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
#include "util.h"
#include <set>
diff --git a/src/rpcclient.h b/src/rpc/client.h
index ae015860b6..ae015860b6 100644
--- a/src/rpcclient.h
+++ b/src/rpc/client.h
diff --git a/src/rpcmining.cpp b/src/rpc/mining.cpp
index 958c817d67..996b7f9cbd 100644
--- a/src/rpcmining.cpp
+++ b/src/rpc/mining.cpp
@@ -14,7 +14,7 @@
#include "miner.h"
#include "net.h"
#include "pow.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "txmempool.h"
#include "util.h"
#include "utilstrencodings.h"
diff --git a/src/rpcmisc.cpp b/src/rpc/misc.cpp
index 9871c3fcc9..0aab9c3043 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpc/misc.cpp
@@ -9,7 +9,7 @@
#include "main.h"
#include "net.h"
#include "netbase.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "timedata.h"
#include "util.h"
#include "utilstrencodings.h"
diff --git a/src/rpcnet.cpp b/src/rpc/net.cpp
index b61e7c5f13..065214a98a 100644
--- a/src/rpcnet.cpp
+++ b/src/rpc/net.cpp
@@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "chainparams.h"
#include "clientversion.h"
diff --git a/src/rpcprotocol.cpp b/src/rpc/protocol.cpp
index b7605545d8..f5275062a2 100644
--- a/src/rpcprotocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "rpcprotocol.h"
+#include "rpc/protocol.h"
#include "random.h"
#include "tinyformat.h"
diff --git a/src/rpcprotocol.h b/src/rpc/protocol.h
index 55d0aac68b..55d0aac68b 100644
--- a/src/rpcprotocol.h
+++ b/src/rpc/protocol.h
diff --git a/src/rpcrawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 64bf569bac..2ec80f468c 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -15,7 +15,7 @@
#include "net.h"
#include "policy/policy.h"
#include "primitives/transaction.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "script/script.h"
#include "script/script_error.h"
#include "script/sign.h"
diff --git a/src/rpcserver.cpp b/src/rpc/server.cpp
index b638598f76..b2d4559ccd 100644
--- a/src/rpcserver.cpp
+++ b/src/rpc/server.cpp
@@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "base58.h"
#include "init.h"
diff --git a/src/rpcserver.h b/src/rpc/server.h
index 219d0422dc..99ffad5d40 100644
--- a/src/rpcserver.h
+++ b/src/rpc/server.h
@@ -7,7 +7,7 @@
#define BITCOIN_RPCSERVER_H
#include "amount.h"
-#include "rpcprotocol.h"
+#include "rpc/protocol.h"
#include "uint256.h"
#include <list>
@@ -175,7 +175,7 @@ extern std::string HelpExampleRpc(const std::string& methodname, const std::stri
extern void EnsureWalletIsUnlocked();
-extern UniValue getconnectioncount(const UniValue& params, bool fHelp); // in rpcnet.cpp
+extern UniValue getconnectioncount(const UniValue& params, bool fHelp); // in rpc/net.cpp
extern UniValue getpeerinfo(const UniValue& params, bool fHelp);
extern UniValue ping(const UniValue& params, bool fHelp);
extern UniValue addnode(const UniValue& params, bool fHelp);
@@ -186,7 +186,7 @@ extern UniValue setban(const UniValue& params, bool fHelp);
extern UniValue listbanned(const UniValue& params, bool fHelp);
extern UniValue clearbanned(const UniValue& params, bool fHelp);
-extern UniValue getgenerate(const UniValue& params, bool fHelp); // in rpcmining.cpp
+extern UniValue getgenerate(const UniValue& params, bool fHelp); // in rpc/mining.cpp
extern UniValue setgenerate(const UniValue& params, bool fHelp);
extern UniValue generate(const UniValue& params, bool fHelp);
extern UniValue getnetworkhashps(const UniValue& params, bool fHelp);
@@ -207,7 +207,7 @@ extern UniValue getblockchaininfo(const UniValue& params, bool fHelp);
extern UniValue getnetworkinfo(const UniValue& params, bool fHelp);
extern UniValue setmocktime(const UniValue& params, bool fHelp);
-extern UniValue getrawtransaction(const UniValue& params, bool fHelp); // in rcprawtransaction.cpp
+extern UniValue getrawtransaction(const UniValue& params, bool fHelp); // in rpc/rawtransaction.cpp
extern UniValue listunspent(const UniValue& params, bool fHelp);
extern UniValue lockunspent(const UniValue& params, bool fHelp);
extern UniValue listlockunspent(const UniValue& params, bool fHelp);
@@ -219,7 +219,7 @@ extern UniValue sendrawtransaction(const UniValue& params, bool fHelp);
extern UniValue gettxoutproof(const UniValue& params, bool fHelp);
extern UniValue verifytxoutproof(const UniValue& params, bool fHelp);
-extern UniValue getblockcount(const UniValue& params, bool fHelp); // in rpcblockchain.cpp
+extern UniValue getblockcount(const UniValue& params, bool fHelp); // in rpc/blockchain.cpp
extern UniValue getbestblockhash(const UniValue& params, bool fHelp);
extern UniValue getdifficulty(const UniValue& params, bool fHelp);
extern UniValue settxfee(const UniValue& params, bool fHelp);
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index cc52e3ea06..d6309ca384 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
#include "base58.h"
#include "netbase.h"
@@ -260,7 +260,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
adr = find_value(o1, "address");
banned_until = find_value(o1, "banned_until");
BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24");
- int64_t now = GetTime();
+ int64_t now = GetTime();
BOOST_CHECK(banned_until.get_int64() > now);
BOOST_CHECK(banned_until.get_int64()-now <= 200);
diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp
index 398372af3c..3443be2093 100644
--- a/src/test/rpc_wallet_tests.cpp
+++ b/src/test/rpc_wallet_tests.cpp
@@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
#include "base58.h"
#include "main.h"
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index b025c37459..9ec28e7b91 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -4,7 +4,7 @@
#include "base58.h"
#include "chain.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "init.h"
#include "main.h"
#include "script/script.h"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8b56a0a3d0..857a3a77e2 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -12,7 +12,7 @@
#include "net.h"
#include "netbase.h"
#include "policy/rbf.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
#include "timedata.h"
#include "util.h"
#include "utilmoneystr.h"
@@ -110,7 +110,7 @@ UniValue getnewaddress(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 1)
throw runtime_error(
"getnewaddress ( \"account\" )\n"
@@ -188,7 +188,7 @@ UniValue getaccountaddress(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() != 1)
throw runtime_error(
"getaccountaddress \"account\"\n"
@@ -220,7 +220,7 @@ UniValue getrawchangeaddress(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 1)
throw runtime_error(
"getrawchangeaddress\n"
@@ -255,7 +255,7 @@ UniValue setaccount(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
"setaccount \"bitcoinaddress\" \"account\"\n"
@@ -301,7 +301,7 @@ UniValue getaccount(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() != 1)
throw runtime_error(
"getaccount \"bitcoinaddress\"\n"
@@ -333,7 +333,7 @@ UniValue getaddressesbyaccount(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() != 1)
throw runtime_error(
"getaddressesbyaccount \"account\"\n"
@@ -401,7 +401,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 2 || params.size() > 5)
throw runtime_error(
"sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment-to\" subtractfeefromamount )\n"
@@ -459,7 +459,7 @@ UniValue listaddressgroupings(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp)
throw runtime_error(
"listaddressgroupings\n"
@@ -510,7 +510,7 @@ UniValue signmessage(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() != 2)
throw runtime_error(
"signmessage \"bitcoinaddress\" \"message\"\n"
@@ -566,7 +566,7 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
"getreceivedbyaddress \"bitcoinaddress\" ( minconf )\n"
@@ -624,7 +624,7 @@ UniValue getreceivedbyaccount(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
"getreceivedbyaccount \"account\" ( minconf )\n"
@@ -713,7 +713,7 @@ UniValue getbalance(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 3)
throw runtime_error(
"getbalance ( \"account\" minconf includeWatchonly )\n"
@@ -788,7 +788,7 @@ UniValue getunconfirmedbalance(const UniValue &params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 0)
throw runtime_error(
"getunconfirmedbalance\n"
@@ -804,7 +804,7 @@ UniValue movecmd(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 3 || params.size() > 5)
throw runtime_error(
"move \"fromaccount\" \"toaccount\" amount ( minconf \"comment\" )\n"
@@ -877,7 +877,7 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 3 || params.size() > 6)
throw runtime_error(
"sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment-to\" )\n"
@@ -941,7 +941,7 @@ UniValue sendmany(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 2 || params.size() > 5)
throw runtime_error(
"sendmany \"fromaccount\" {\"address\":amount,...} ( minconf \"comment\" [\"address\",...] )\n"
@@ -1048,14 +1048,14 @@ UniValue sendmany(const UniValue& params, bool fHelp)
return wtx.GetHash().GetHex();
}
-// Defined in rpcmisc.cpp
+// Defined in rpc/misc.cpp
extern CScript _createmultisig_redeemScript(const UniValue& params);
UniValue addmultisigaddress(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 2 || params.size() > 3)
{
string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n"
@@ -1238,7 +1238,7 @@ UniValue listreceivedbyaddress(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 3)
throw runtime_error(
"listreceivedbyaddress ( minconf includeempty includeWatchonly)\n"
@@ -1276,7 +1276,7 @@ UniValue listreceivedbyaccount(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 3)
throw runtime_error(
"listreceivedbyaccount ( minconf includeempty includeWatchonly)\n"
@@ -1411,7 +1411,7 @@ UniValue listtransactions(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 4)
throw runtime_error(
"listtransactions ( \"account\" count from includeWatchonly)\n"
@@ -1537,7 +1537,7 @@ UniValue listaccounts(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 2)
throw runtime_error(
"listaccounts ( minconf includeWatchonly)\n"
@@ -1616,7 +1616,7 @@ UniValue listsinceblock(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp)
throw runtime_error(
"listsinceblock ( \"blockhash\" target-confirmations includeWatchonly)\n"
@@ -1708,7 +1708,7 @@ UniValue gettransaction(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
"gettransaction \"txid\" ( includeWatchonly )\n"
@@ -1823,7 +1823,7 @@ UniValue backupwallet(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() != 1)
throw runtime_error(
"backupwallet \"destination\"\n"
@@ -1849,7 +1849,7 @@ UniValue keypoolrefill(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 1)
throw runtime_error(
"keypoolrefill ( newsize )\n"
@@ -1893,7 +1893,7 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
throw runtime_error(
"walletpassphrase \"passphrase\" timeout\n"
@@ -1953,7 +1953,7 @@ UniValue walletpassphrasechange(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
throw runtime_error(
"walletpassphrasechange \"oldpassphrase\" \"newpassphrase\"\n"
@@ -1999,7 +1999,7 @@ UniValue walletlock(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 0))
throw runtime_error(
"walletlock\n"
@@ -2038,7 +2038,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1))
throw runtime_error(
"encryptwallet \"passphrase\"\n"
@@ -2095,7 +2095,7 @@ UniValue lockunspent(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error(
"lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n"
@@ -2179,7 +2179,7 @@ UniValue listlockunspent(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 0)
throw runtime_error(
"listlockunspent\n"
@@ -2228,7 +2228,7 @@ UniValue settxfee(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() < 1 || params.size() > 1)
throw runtime_error(
"settxfee amount\n"
@@ -2255,7 +2255,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() != 0)
throw runtime_error(
"getwalletinfo\n"
@@ -2297,7 +2297,7 @@ UniValue resendwallettransactions(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() != 0)
throw runtime_error(
"resendwallettransactions\n"
@@ -2322,7 +2322,7 @@ UniValue listunspent(const UniValue& params, bool fHelp)
{
if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue;
-
+
if (fHelp || params.size() > 3)
throw runtime_error(
"listunspent ( minconf maxconf [\"address\",...] )\n"