From 5a627762c12fb25c07d020a656018a858e9fa05e Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 5 Feb 2019 10:47:50 -0500
Subject: [PATCH] Merge #15245: remove deprecated mentions of
 signrawtransaction from fundraw help

851380ce17 remove deprecated mentions of signrawtransaction from fundraw help (Gregory Sanders)

Pull request description:

  RPC call has been removed as of 0.17.99.

Tree-SHA512: a6a12a0e4572acd9b532c1719be85ed6f29d1c1a28f9ce691398528b8dde4fb4a3222b8f68632fcb1a8eddfe2d31e96d5efd5bc51c041af8e7cb99b61ca3a167
---
 contrib/dash-cli.bash-completion | 2 +-
 src/dash-tx.cpp                  | 2 +-
 src/rpc/client.cpp               | 2 --
 src/txmempool.h                  | 3 ++-
 src/wallet/rpcwallet.cpp         | 5 +++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/dash-cli.bash-completion b/contrib/dash-cli.bash-completion
index 97a2531bb5..7b67801d90 100644
--- a/contrib/dash-cli.bash-completion
+++ b/contrib/dash-cli.bash-completion
@@ -50,7 +50,7 @@ _dash_cli() {
                 COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
                 return 0
                 ;;
-            signrawtransaction)
+            signrawtransactionwithkey|signrawtransactionwithwallet)
                 COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) )
                 return 0
                 ;;
diff --git a/src/dash-tx.cpp b/src/dash-tx.cpp
index f5de915240..335aa420dc 100644
--- a/src/dash-tx.cpp
+++ b/src/dash-tx.cpp
@@ -59,7 +59,7 @@ static void SetupBitcoinTxArgs()
         "This command requires JSON registers:"
         "prevtxs=JSON object, "
         "privatekeys=JSON object. "
-        "See signrawtransaction docs for format of sighash flags, JSON objects.", false, OptionsCategory::COMMANDS);
+        "See signrawtransactionwithkey docs for format of sighash flags, JSON objects.", false, OptionsCategory::COMMANDS);
 
     gArgs.AddArg("load=NAME:FILENAME", "Load JSON file FILENAME into register NAME", false, OptionsCategory::REGISTER_COMMANDS);
     gArgs.AddArg("set=NAME:JSON-STRING", "Set register NAME to given JSON-STRING", false, OptionsCategory::REGISTER_COMMANDS);
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index fdac3a86f2..239b5b8a0e 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -119,8 +119,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "createrawtransaction", 0, "inputs" },
     { "createrawtransaction", 1, "outputs" },
     { "createrawtransaction", 2, "locktime" },
-    { "signrawtransaction", 1, "prevtxs" },
-    { "signrawtransaction", 2, "privkeys" },
     { "signrawtransactionwithkey", 1, "privkeys" },
     { "signrawtransactionwithkey", 2, "prevtxs" },
     { "signrawtransactionwithwallet", 1, "prevtxs" },
diff --git a/src/txmempool.h b/src/txmempool.h
index 8fb1aa6f48..4505aacadd 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -838,7 +838,8 @@ public:
  * This allows transaction replacement to work as expected, as you want to
  * have all inputs "available" to check signatures, and any cycles in the
  * dependency graph are checked directly in AcceptToMemoryPool.
- * It also allows you to sign a double-spend directly in signrawtransaction,
+ * It also allows you to sign a double-spend directly in
+ * signrawtransactionwithkey and signrawtransactionwithwallet,
  * as long as the conflicting transaction is not yet confirmed.
  */
 class CCoinsViewMemPool : public CCoinsViewBacked
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 48f4702957..0d23aa9e36 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3879,7 +3879,8 @@ static UniValue fundrawtransaction(const JSONRPCRequest& request)
           "This will not modify existing inputs, and will add at most one change output to the outputs.\n"
           "No existing outputs will be modified unless \"subtractFeeFromOutputs\" is specified.\n"
           "Note that inputs which were signed may need to be resigned after completion since in/outputs have been added.\n"
-          "The inputs added will not be signed, use signrawtransaction for that.\n"
+          "The inputs added will not be signed, use signrawtransactionwithkey\n"
+          " or signrawtransactionwithwallet for that.\n"
           "Note that all existing inputs must have their previous output transaction be in the wallet.\n"
           "Note that all inputs selected must be of standard form and P2SH scripts must be\n"
           "in the wallet using importaddress or addmultisigaddress (to calculate fees).\n"
@@ -3919,7 +3920,7 @@ static UniValue fundrawtransaction(const JSONRPCRequest& request)
           "\nAdd sufficient unsigned inputs to meet the output value\n"
           + HelpExampleCli("fundrawtransaction", "\"rawtransactionhex\"") +
           "\nSign the transaction\n"
-          + HelpExampleCli("signrawtransaction", "\"fundedtransactionhex\"") +
+          + HelpExampleCli("signrawtransactionwithwallet", "\"fundedtransactionhex\"") +
           "\nSend the transaction\n"
           + HelpExampleCli("sendrawtransaction", "\"signedtransactionhex\"")
           );