kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

move rpc* to rpc/

0.13
Daniel Cousens 9 years ago
parent
b92ea98503
commit
a0eaff8a1d
24 changed files with 74 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/Makefile.am
  2. 4
      src/bitcoin-cli.cpp
  3. 3
      src/bitcoind.cpp
  4. 4
      src/httprpc.cpp
  5. 2
      src/httpserver.cpp
  6. 2
      src/init.cpp
  7. 2
      src/qt/bitcoin.cpp
  8. 4
      src/qt/rpcconsole.cpp
  9. 2
      src/rest.cpp
  10. 2
      src/rpc/blockchain.cpp
  11. 5
      src/rpc/client.cpp
  12. 0
      src/rpc/client.h
  13. 2
      src/rpc/mining.cpp
  14. 2
      src/rpc/misc.cpp
  15. 2
      src/rpc/net.cpp
  16. 2
      src/rpc/protocol.cpp
  17. 0
      src/rpc/protocol.h
  18. 2
      src/rpc/rawtransaction.cpp
  19. 2
      src/rpc/server.cpp
  20. 2
      src/rpc/server.h
  21. 6
      src/test/rpc_tests.cpp
  22. 4
      src/test/rpc_wallet_tests.cpp
  23. 2
      src/wallet/rpcdump.cpp
  24. 72
      src/wallet/rpcwallet.cpp

22
src/Makefile.am
Unescape View File

@ -131,9 +131,9 @@ BITCOIN_CORE_H = \
pubkey.h \ pubkey.h \
random.h \ random.h \
reverselock.h \ reverselock.h \
rpcclient.h \ rpc/client.h \
rpcprotocol.h \ rpc/protocol.h \
rpcserver.h \ rpc/server.h \
scheduler.h \ scheduler.h \
script/interpreter.h \ script/interpreter.h \
script/script.h \ script/script.h \
@ -203,12 +203,12 @@ libbitcoin_server_a_SOURCES = \
policy/policy.cpp \ policy/policy.cpp \
pow.cpp \ pow.cpp \
rest.cpp \ rest.cpp \
rpcblockchain.cpp \ rpc/blockchain.cpp \
rpcmining.cpp \ rpc/mining.cpp \
rpcmisc.cpp \ rpc/misc.cpp \
rpcnet.cpp \ rpc/net.cpp \
rpcrawtransaction.cpp \ rpc/rawtransaction.cpp \
rpcserver.cpp \ rpc/server.cpp \
script/sigcache.cpp \ script/sigcache.cpp \
timedata.cpp \ timedata.cpp \
torcontrol.cpp \ torcontrol.cpp \
@ -304,7 +304,7 @@ libbitcoin_util_a_SOURCES = \
compat/glibcxx_sanity.cpp \ compat/glibcxx_sanity.cpp \
compat/strnlen.cpp \ compat/strnlen.cpp \
random.cpp \ random.cpp \
rpcprotocol.cpp \ rpc/protocol.cpp \
support/cleanse.cpp \ support/cleanse.cpp \
sync.cpp \ sync.cpp \
uint256.cpp \ uint256.cpp \
@ -322,7 +322,7 @@ endif
libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_cli_a_SOURCES = \ libbitcoin_cli_a_SOURCES = \
rpcclient.cpp \ rpc/client.cpp \
$(BITCOIN_CORE_H) $(BITCOIN_CORE_H)
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h

4
src/bitcoin-cli.cpp
Unescape View File

@ -5,8 +5,8 @@
#include "chainparamsbase.h" #include "chainparamsbase.h"
#include "clientversion.h" #include "clientversion.h"
#include "rpcclient.h" #include "rpc/client.h"
#include "rpcprotocol.h" #include "rpc/protocol.h"
#include "util.h" #include "util.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"

3
src/bitcoind.cpp
Unescape View File

@ -5,14 +5,13 @@
#include "chainparams.h" #include "chainparams.h"
#include "clientversion.h" #include "clientversion.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "init.h" #include "init.h"
#include "noui.h" #include "noui.h"
#include "scheduler.h" #include "scheduler.h"
#include "util.h" #include "util.h"
#include "httpserver.h" #include "httpserver.h"
#include "httprpc.h" #include "httprpc.h"
#include "rpcserver.h"
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>

4
src/httprpc.cpp
Unescape View File

@ -3,8 +3,8 @@
#include "base58.h" #include "base58.h"
#include "chainparams.h" #include "chainparams.h"
#include "httpserver.h" #include "httpserver.h"
#include "rpcprotocol.h" #include "rpc/protocol.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "random.h" #include "random.h"
#include "sync.h" #include "sync.h"
#include "util.h" #include "util.h"

2
src/httpserver.cpp
Unescape View File

@ -8,7 +8,7 @@
#include "compat.h" #include "compat.h"
#include "util.h" #include "util.h"
#include "netbase.h" #include "netbase.h"
#include "rpcprotocol.h" // For HTTP status codes #include "rpc/protocol.h" // For HTTP status codes
#include "sync.h" #include "sync.h"
#include "ui_interface.h" #include "ui_interface.h"

2
src/init.cpp
Unescape View File

@ -23,7 +23,7 @@
#include "miner.h" #include "miner.h"
#include "net.h" #include "net.h"
#include "policy/policy.h" #include "policy/policy.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "script/standard.h" #include "script/standard.h"
#include "script/sigcache.h" #include "script/sigcache.h"
#include "scheduler.h" #include "scheduler.h"

2
src/qt/bitcoin.cpp
Unescape View File

@ -26,7 +26,7 @@
#endif #endif
#include "init.h" #include "init.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "scheduler.h" #include "scheduler.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "util.h" #include "util.h"

4
src/qt/rpcconsole.cpp
Unescape View File

@ -12,8 +12,8 @@
#include "bantablemodel.h" #include "bantablemodel.h"
#include "chainparams.h" #include "chainparams.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "rpcclient.h" #include "rpc/client.h"
#include "util.h" #include "util.h"
#include <openssl/crypto.h> #include <openssl/crypto.h>

2
src/rest.cpp
Unescape View File

@ -9,7 +9,7 @@
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "main.h" #include "main.h"
#include "httpserver.h" #include "httpserver.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "streams.h" #include "streams.h"
#include "sync.h" #include "sync.h"
#include "txmempool.h" #include "txmempool.h"

2
src/rpcblockchain.cpp → src/rpc/blockchain.cpp
Unescape View File

@ -12,7 +12,7 @@
#include "main.h" #include "main.h"
#include "policy/policy.h" #include "policy/policy.h"
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "streams.h" #include "streams.h"
#include "sync.h" #include "sync.h"
#include "txmempool.h" #include "txmempool.h"

5
src/rpcclient.cpp → src/rpc/client.cpp
Unescape View File

@ -3,9 +3,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcclient.h" #include "rpc/client.h"
#include "rpc/protocol.h"
#include "rpcprotocol.h"
#include "util.h" #include "util.h"
#include <set> #include <set>

0
src/rpcclient.h → src/rpc/client.h
Unescape View File

2
src/rpcmining.cpp → src/rpc/mining.cpp
Unescape View File

@ -14,7 +14,7 @@
#include "miner.h" #include "miner.h"
#include "net.h" #include "net.h"
#include "pow.h" #include "pow.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "txmempool.h" #include "txmempool.h"
#include "util.h" #include "util.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"

2
src/rpcmisc.cpp → src/rpc/misc.cpp
Unescape View File

@ -9,7 +9,7 @@
#include "main.h" #include "main.h"
#include "net.h" #include "net.h"
#include "netbase.h" #include "netbase.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "timedata.h" #include "timedata.h"
#include "util.h" #include "util.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"

2
src/rpcnet.cpp → src/rpc/net.cpp
Unescape View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcserver.h" #include "rpc/server.h"
#include "chainparams.h" #include "chainparams.h"
#include "clientversion.h" #include "clientversion.h"

2
src/rpcprotocol.cpp → src/rpc/protocol.cpp
Unescape View File

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcprotocol.h" #include "rpc/protocol.h"
#include "random.h" #include "random.h"
#include "tinyformat.h" #include "tinyformat.h"

0
src/rpcprotocol.h → src/rpc/protocol.h
Unescape View File

2
src/rpcrawtransaction.cpp → src/rpc/rawtransaction.cpp
Unescape View File

@ -15,7 +15,7 @@
#include "net.h" #include "net.h"
#include "policy/policy.h" #include "policy/policy.h"
#include "primitives/transaction.h" #include "primitives/transaction.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "script/script.h" #include "script/script.h"
#include "script/script_error.h" #include "script/script_error.h"
#include "script/sign.h" #include "script/sign.h"

2
src/rpcserver.cpp → src/rpc/server.cpp
Unescape View File

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcserver.h" #include "rpc/server.h"
#include "base58.h" #include "base58.h"
#include "init.h" #include "init.h"

2
src/rpcserver.h → src/rpc/server.h
Unescape View File

@ -7,7 +7,7 @@
#define BITCOIN_RPCSERVER_H #define BITCOIN_RPCSERVER_H
#include "amount.h" #include "amount.h"
#include "rpcprotocol.h" #include "rpc/protocol.h"
#include "uint256.h" #include "uint256.h"
#include <list> #include <list>

6
src/test/rpc_tests.cpp
Unescape View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcserver.h" #include "rpc/server.h"
#include "rpcclient.h" #include "rpc/client.h"
#include "base58.h" #include "base58.h"
#include "netbase.h" #include "netbase.h"
@ -260,7 +260,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
adr = find_value(o1, "address"); adr = find_value(o1, "address");
banned_until = find_value(o1, "banned_until"); banned_until = find_value(o1, "banned_until");
BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/24"); 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);
BOOST_CHECK(banned_until.get_int64()-now <= 200); BOOST_CHECK(banned_until.get_int64()-now <= 200);

4
src/test/rpc_wallet_tests.cpp
Unescape View File

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "rpcserver.h" #include "rpc/server.h"
#include "rpcclient.h" #include "rpc/client.h"
#include "base58.h" #include "base58.h"
#include "main.h" #include "main.h"

2
src/wallet/rpcdump.cpp
Unescape View File

@ -4,7 +4,7 @@
#include "base58.h" #include "base58.h"
#include "chain.h" #include "chain.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "init.h" #include "init.h"
#include "main.h" #include "main.h"
#include "script/script.h" #include "script/script.h"

72
src/wallet/rpcwallet.cpp
Unescape View File

@ -12,7 +12,7 @@
#include "net.h" #include "net.h"
#include "netbase.h" #include "netbase.h"
#include "policy/rbf.h" #include "policy/rbf.h"
#include "rpcserver.h" #include "rpc/server.h"
#include "timedata.h" #include "timedata.h"
#include "util.h" #include "util.h"
#include "utilmoneystr.h" #include "utilmoneystr.h"
@ -110,7 +110,7 @@ UniValue getnewaddress(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 1) if (fHelp || params.size() > 1)
throw runtime_error( throw runtime_error(
"getnewaddress ( \"account\" )\n" "getnewaddress ( \"account\" )\n"
@ -189,7 +189,7 @@ UniValue getaccountaddress(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() != 1) if (fHelp || params.size() != 1)
throw runtime_error( throw runtime_error(
"getaccountaddress \"account\"\n" "getaccountaddress \"account\"\n"
@ -221,7 +221,7 @@ UniValue getrawchangeaddress(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 1) if (fHelp || params.size() > 1)
throw runtime_error( throw runtime_error(
"getrawchangeaddress\n" "getrawchangeaddress\n"
@ -256,7 +256,7 @@ UniValue setaccount(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error( throw runtime_error(
"setaccount \"bitcoinaddress\" \"account\"\n" "setaccount \"bitcoinaddress\" \"account\"\n"
@ -302,7 +302,7 @@ UniValue getaccount(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() != 1) if (fHelp || params.size() != 1)
throw runtime_error( throw runtime_error(
"getaccount \"bitcoinaddress\"\n" "getaccount \"bitcoinaddress\"\n"
@ -334,7 +334,7 @@ UniValue getaddressesbyaccount(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() != 1) if (fHelp || params.size() != 1)
throw runtime_error( throw runtime_error(
"getaddressesbyaccount \"account\"\n" "getaddressesbyaccount \"account\"\n"
@ -402,7 +402,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 2 || params.size() > 5) if (fHelp || params.size() < 2 || params.size() > 5)
throw runtime_error( throw runtime_error(
"sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment-to\" subtractfeefromamount )\n" "sendtoaddress \"bitcoinaddress\" amount ( \"comment\" \"comment-to\" subtractfeefromamount )\n"
@ -460,7 +460,7 @@ UniValue listaddressgroupings(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp) if (fHelp)
throw runtime_error( throw runtime_error(
"listaddressgroupings\n" "listaddressgroupings\n"
@ -511,7 +511,7 @@ UniValue signmessage(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() != 2) if (fHelp || params.size() != 2)
throw runtime_error( throw runtime_error(
"signmessage \"bitcoinaddress\" \"message\"\n" "signmessage \"bitcoinaddress\" \"message\"\n"
@ -567,7 +567,7 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error( throw runtime_error(
"getreceivedbyaddress \"bitcoinaddress\" ( minconf )\n" "getreceivedbyaddress \"bitcoinaddress\" ( minconf )\n"
@ -625,7 +625,7 @@ UniValue getreceivedbyaccount(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error( throw runtime_error(
"getreceivedbyaccount \"account\" ( minconf )\n" "getreceivedbyaccount \"account\" ( minconf )\n"
@ -714,7 +714,7 @@ UniValue getbalance(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 3) if (fHelp || params.size() > 3)
throw runtime_error( throw runtime_error(
"getbalance ( \"account\" minconf includeWatchonly )\n" "getbalance ( \"account\" minconf includeWatchonly )\n"
@ -789,7 +789,7 @@ UniValue getunconfirmedbalance(const UniValue &params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 0) if (fHelp || params.size() > 0)
throw runtime_error( throw runtime_error(
"getunconfirmedbalance\n" "getunconfirmedbalance\n"
@ -805,7 +805,7 @@ UniValue movecmd(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 3 || params.size() > 5) if (fHelp || params.size() < 3 || params.size() > 5)
throw runtime_error( throw runtime_error(
"move \"fromaccount\" \"toaccount\" amount ( minconf \"comment\" )\n" "move \"fromaccount\" \"toaccount\" amount ( minconf \"comment\" )\n"
@ -878,7 +878,7 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 3 || params.size() > 6) if (fHelp || params.size() < 3 || params.size() > 6)
throw runtime_error( throw runtime_error(
"sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment-to\" )\n" "sendfrom \"fromaccount\" \"tobitcoinaddress\" amount ( minconf \"comment\" \"comment-to\" )\n"
@ -942,7 +942,7 @@ UniValue sendmany(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 2 || params.size() > 5) if (fHelp || params.size() < 2 || params.size() > 5)
throw runtime_error( throw runtime_error(
"sendmany \"fromaccount\" {\"address\":amount,...} ( minconf \"comment\" [\"address\",...] )\n" "sendmany \"fromaccount\" {\"address\":amount,...} ( minconf \"comment\" [\"address\",...] )\n"
@ -1056,7 +1056,7 @@ UniValue addmultisigaddress(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 2 || params.size() > 3) if (fHelp || params.size() < 2 || params.size() > 3)
{ {
string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n" string msg = "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n"
@ -1239,7 +1239,7 @@ UniValue listreceivedbyaddress(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 3) if (fHelp || params.size() > 3)
throw runtime_error( throw runtime_error(
"listreceivedbyaddress ( minconf includeempty includeWatchonly)\n" "listreceivedbyaddress ( minconf includeempty includeWatchonly)\n"
@ -1277,7 +1277,7 @@ UniValue listreceivedbyaccount(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 3) if (fHelp || params.size() > 3)
throw runtime_error( throw runtime_error(
"listreceivedbyaccount ( minconf includeempty includeWatchonly)\n" "listreceivedbyaccount ( minconf includeempty includeWatchonly)\n"
@ -1412,7 +1412,7 @@ UniValue listtransactions(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 4) if (fHelp || params.size() > 4)
throw runtime_error( throw runtime_error(
"listtransactions ( \"account\" count from includeWatchonly)\n" "listtransactions ( \"account\" count from includeWatchonly)\n"
@ -1538,7 +1538,7 @@ UniValue listaccounts(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 2) if (fHelp || params.size() > 2)
throw runtime_error( throw runtime_error(
"listaccounts ( minconf includeWatchonly)\n" "listaccounts ( minconf includeWatchonly)\n"
@ -1617,7 +1617,7 @@ UniValue listsinceblock(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp) if (fHelp)
throw runtime_error( throw runtime_error(
"listsinceblock ( \"blockhash\" target-confirmations includeWatchonly)\n" "listsinceblock ( \"blockhash\" target-confirmations includeWatchonly)\n"
@ -1709,7 +1709,7 @@ UniValue gettransaction(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error( throw runtime_error(
"gettransaction \"txid\" ( includeWatchonly )\n" "gettransaction \"txid\" ( includeWatchonly )\n"
@ -1824,7 +1824,7 @@ UniValue backupwallet(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() != 1) if (fHelp || params.size() != 1)
throw runtime_error( throw runtime_error(
"backupwallet \"destination\"\n" "backupwallet \"destination\"\n"
@ -1850,7 +1850,7 @@ UniValue keypoolrefill(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 1) if (fHelp || params.size() > 1)
throw runtime_error( throw runtime_error(
"keypoolrefill ( newsize )\n" "keypoolrefill ( newsize )\n"
@ -1894,7 +1894,7 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2)) if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
throw runtime_error( throw runtime_error(
"walletpassphrase \"passphrase\" timeout\n" "walletpassphrase \"passphrase\" timeout\n"
@ -1954,7 +1954,7 @@ UniValue walletpassphrasechange(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2)) if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
throw runtime_error( throw runtime_error(
"walletpassphrasechange \"oldpassphrase\" \"newpassphrase\"\n" "walletpassphrasechange \"oldpassphrase\" \"newpassphrase\"\n"
@ -2000,7 +2000,7 @@ UniValue walletlock(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 0)) if (pwalletMain->IsCrypted() && (fHelp || params.size() != 0))
throw runtime_error( throw runtime_error(
"walletlock\n" "walletlock\n"
@ -2039,7 +2039,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1)) if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1))
throw runtime_error( throw runtime_error(
"encryptwallet \"passphrase\"\n" "encryptwallet \"passphrase\"\n"
@ -2096,7 +2096,7 @@ UniValue lockunspent(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() < 1 || params.size() > 2)
throw runtime_error( throw runtime_error(
"lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n" "lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n"
@ -2180,7 +2180,7 @@ UniValue listlockunspent(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 0) if (fHelp || params.size() > 0)
throw runtime_error( throw runtime_error(
"listlockunspent\n" "listlockunspent\n"
@ -2229,7 +2229,7 @@ UniValue settxfee(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() < 1 || params.size() > 1) if (fHelp || params.size() < 1 || params.size() > 1)
throw runtime_error( throw runtime_error(
"settxfee amount\n" "settxfee amount\n"
@ -2256,7 +2256,7 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() != 0) if (fHelp || params.size() != 0)
throw runtime_error( throw runtime_error(
"getwalletinfo\n" "getwalletinfo\n"
@ -2298,7 +2298,7 @@ UniValue resendwallettransactions(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() != 0) if (fHelp || params.size() != 0)
throw runtime_error( throw runtime_error(
"resendwallettransactions\n" "resendwallettransactions\n"
@ -2323,7 +2323,7 @@ UniValue listunspent(const UniValue& params, bool fHelp)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
return NullUniValue; return NullUniValue;
if (fHelp || params.size() > 3) if (fHelp || params.size() > 3)
throw runtime_error( throw runtime_error(
"listunspent ( minconf maxconf [\"address\",...] )\n" "listunspent ( minconf maxconf [\"address\",...] )\n"

Write Preview
Loading…
Cancel
Save