[Pkg-bitcoin-commits] [bitcoin] 61/126: Update importprivkey named args documentation

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.15.1_dfsg-1
in repository bitcoin.

commit 405e069d3b8c71b0f5161d9dfb2334a0bb988f2e
Author: Dusty Williams <dusty.wil at gmail.com>
Date:   Sun Oct 8 23:18:48 2017 -0400

    Update importprivkey named args documentation
    
    Fixes #11462. Updated documentation for importprivkey function to use the correct name for the first argument.
    Also updates a call to importprivkey to use named args in functional test.
    
    Github-Pull: #11465
    Rebased-From: aa57590d7c5eab1df5443e8ac9ed53ad0db46c02
---
 src/wallet/rpcdump.cpp               | 4 ++--
 test/functional/importprunedfunds.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index e56485e..8e0e4a8 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -79,10 +79,10 @@ UniValue importprivkey(const JSONRPCRequest& request)
 
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
         throw std::runtime_error(
-            "importprivkey \"bitcoinprivkey\" ( \"label\" ) ( rescan )\n"
+            "importprivkey \"privkey\" ( \"label\" ) ( rescan )\n"
             "\nAdds a private key (as returned by dumpprivkey) to your wallet.\n"
             "\nArguments:\n"
-            "1. \"bitcoinprivkey\"   (string, required) The private key (see dumpprivkey)\n"
+            "1. \"privkey\"          (string, required) The private key (see dumpprivkey)\n"
             "2. \"label\"            (string, optional, default=\"\") An optional label\n"
             "3. rescan               (boolean, optional, default=true) Rescan the wallet for transactions\n"
             "\nNote: This call can take minutes to complete if rescan is true.\n"
diff --git a/test/functional/importprunedfunds.py b/test/functional/importprunedfunds.py
index 94753fe..198a205 100755
--- a/test/functional/importprunedfunds.py
+++ b/test/functional/importprunedfunds.py
@@ -82,8 +82,8 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
         assert_equal(balance2, Decimal('0.05'))
 
         #Import with private key with no rescan
-        self.nodes[1].importprivkey(address3_privkey, "add3", False)
-        result3 = self.nodes[1].importprunedfunds(rawtxn3, proof3)
+        self.nodes[1].importprivkey(privkey=address3_privkey, label="add3", rescan=False)
+        self.nodes[1].importprunedfunds(rawtxn3, proof3)
         balance3 = self.nodes[1].getbalance("add3", 0, False)
         assert_equal(balance3, Decimal('0.025'))
         balance3 = self.nodes[1].getbalance("*", 0, True)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/bitcoin.git