From bbb093652e33c0905d93f9d4bb70dbaf269e0cad Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 29 Nov 2013 15:48:07 +0100 Subject: [PATCH] Move HelpExample* from rpcwallet to rpcserver General functions used throughout the RPC framework don't belong in rpcwallet. --- src/rpcserver.cpp | 9 +++++++++ src/rpcwallet.cpp | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index c746d8c8f..949e81e07 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -820,4 +820,13 @@ json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_s } } +std::string HelpExampleCli(string methodname, string args){ + return "> bitcoin-cli " + methodname + " " + args + "\n"; +} + +std::string HelpExampleRpc(string methodname, string args){ + return "> curl --user myusername --data-binary '{\"jsonrpc\": \"1.0\", \"id\":\"curltest\", " + "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:8332/\n"; +} + const CRPCTable tableRPC; diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index b4e522de8..77ebc189a 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -33,15 +33,6 @@ std::string HelpRequiringPassphrase() : ""; } -std::string HelpExampleCli(string methodname, string args){ - return "> bitcoin-cli " + methodname + " " + args + "\n"; -} - -std::string HelpExampleRpc(string methodname, string args){ - return "> curl --user myusername --data-binary '{\"jsonrpc\": \"1.0\", \"id\":\"curltest\", " - "\"method\": \"" + methodname + "\", \"params\": [" + args + "] }' -H 'content-type: text/plain;' http://127.0.0.1:8332/\n"; -} - void EnsureWalletIsUnlocked() { if (pwalletMain->IsLocked())