Moved RPC type conversion for usewallet to RPCConvertValues function.

CodeShark · Jan 7, 2013 · ebf85b1 · ebf85b1
1 parent 629ca2f
commit ebf85b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
@@ -1231,6 +1231,15 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
     if (strMethod == "loadwallet"             && n > 1) ConvertTo<bool>(params[1]);
     if (strMethod == "loadwallet"             && n > 2) ConvertTo<bool>(params[2]);
     if (strMethod == "loadwallet"             && n > 3) ConvertTo<boost::int64_t>(params[3]);
+    if (strMethod == "usewallet"              && n > 3)
+    {
+        vector<string> subStrParams;
+        for (unsigned int i = 3; i < strParams.size(); i++)
+            subStrParams.push_back(strParams[i]);
+
+        Array subParams = RPCConvertValues(strParams[2], subStrParams);
+        params.insert(params.begin(), strParams.begin(), strParams.begin() + 2);
+    }
 
     return params;
 }

diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
@@ -1580,12 +1580,8 @@ Value usewallet(CWallet* pWallet, const Array& params, bool fHelp)
 
     if (!pcmd->isWalletFn)
         throw JSONRPCError(RPC_INVALID_PARAMETER, string("Method ") + strMethod + " is not a wallet method.");
-
-    vector<string> vstrParams;
-    for (unsigned int i = 2; i < params.size(); i++)
-        vstrParams.push_back(params[i].get_str());
 
-    return tableRPC.execute(strMethod, RPCConvertValues(strMethod, vstrParams), pWallet);
+    return tableRPC.execute(strMethod, params, pWallet);
 }
 
 Value loadwallet(CWallet* pWallet, const Array& params, bool fHelp)