From: Peter Todd <pete@petertodd.org>
Date: Sat, 28 Apr 2012 20:29:27 +0000 (-0400)
Subject: Fixed non-sensical error message
X-Git-Tag: v0.4.0-unstable~129^2~1^2~16
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=e2b9bf9e6e846d2b182baf889f556e624c02e7a8

Fixed non-sensical error message

Previously trying to create a multisig address that required less than
one signature would output something like the following:

"wrong number of keys(got 1, need at least 0)"
---

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 15bcf1d..0b851c4 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -999,10 +999,12 @@ Value addmultisigaddress(const Array& params, bool fHelp)
         strAccount = AccountFromValue(params[2]);
 
     // Gather public keys
-    if ((nRequired < 1) || ((int)keys.size() < nRequired))
+    if (nRequired < 1)
+        throw runtime_error("a multisignature address must require at least one key to redeem");
+    if ((int)keys.size() < nRequired)
         throw runtime_error(
-            strprintf("wrong number of keys"
-                      "(got %d, need at least %d)", keys.size(), nRequired));
+            strprintf("not enough keys supplied "
+                      "(got %d keys, but need at least %d to redeem)", keys.size(), nRequired));
     std::vector<CKey> pubkeys;
     pubkeys.resize(keys.size());
     for (unsigned int i = 0; i < keys.size(); i++)