Merge #13507: RPC: Fix parameter count check for importpubkey

laanwj · laanwj · commit 452bb90c718d · 2018-06-25T20:43:30.000+02:00
3f72d04 Fix parameter count check for importpubkey. (Kristaps Kaupe) Pull request description: Found this while working on #13464. Parameter count check for `importpubkey` was wrong. Tree-SHA512: aba41b666c6493379f320be5e3e438a6cad1a96429102ff4428c092c48f29c2eead2195792c0b018296f20e1c42eb091dd5b9886c42cecbb1f0d03d5def14705
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -441,7 +441,7 @@ UniValue importpubkey(const JSONRPCRequest& request)
         return NullUniValue;
     }
 
-    if (request.fHelp || request.params.size() < 1 || request.params.size() > 4)
+    if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
         throw std::runtime_error(
             "importpubkey \"pubkey\" ( \"label\" rescan )\n"
             "\nAdds a public key (in hex) that can be watched as if it were in your wallet but cannot be used to spend. Requires a new wallet backup.\n"

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ UniValue importpubkey(const JSONRPCRequest& request)`
`441`	`441`	`return NullUniValue;`
`442`	`442`	`}`
`443`	`443`
`444`		`- if (request.fHelp \|\| request.params.size() < 1 \|\| request.params.size() > 4)`
	`444`	`+ if (request.fHelp \|\| request.params.size() < 1 \|\| request.params.size() > 3)`
`445`	`445`	`throw std::runtime_error(`
`446`	`446`	`"importpubkey \"pubkey\" ( \"label\" rescan )\n"`
`447`	`447`	`"\nAdds a public key (in hex) that can be watched as if it were in your wallet but cannot be used to spend. Requires a new wallet backup.\n"`