[Modularization] allow to add entries to the JSON conversion table

dexX7 · dexX7 · commit c614786f176d · 2015-03-07T10:15:57.000+01:00
- expose CRPCConvertTable class
- expose CRPCConvertTable rpcCvtTable
- add method to insert custom conversion entries
diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp
@@ -90,31 +90,28 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "prioritisetransaction", 2 },
 };
 
-class CRPCConvertTable
-{
-private:
-    std::set<std::pair<std::string, int> > members;
-
-public:
-    CRPCConvertTable();
-
-    bool convert(const std::string& method, int idx) {
-        return (members.count(std::make_pair(method, idx)) > 0);
-    }
-};
-
 CRPCConvertTable::CRPCConvertTable()
 {
     const unsigned int n_elem =
         (sizeof(vRPCConvertParams) / sizeof(vRPCConvertParams[0]));
 
     for (unsigned int i = 0; i < n_elem; i++) {
-        members.insert(std::make_pair(vRPCConvertParams[i].methodName,
-                                      vRPCConvertParams[i].paramIdx));
+        addConversion(vRPCConvertParams[i].methodName,
+                      vRPCConvertParams[i].paramIdx);
     }
 }
 
-static CRPCConvertTable rpcCvtTable;
+void CRPCConvertTable::addConversion(const std::string& method, int idx)
+{
+    members.insert(std::make_pair(method, idx));
+}
+
+bool CRPCConvertTable::convert(const std::string& method, int idx)
+{
+    return (members.count(std::make_pair(method, idx)) > 0);
+}
+
+CRPCConvertTable rpcCvtTable;
 
 /** Convert strings to command-specific RPC representation */
 Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams)
diff --git a/src/rpcclient.h b/src/rpcclient.h
@@ -10,6 +10,36 @@
 #include "json/json_spirit_utils.h"
 #include "json/json_spirit_writer_template.h"
 
+#include <set>
+#include <string>
+#include <utility>
+
+class CRPCConvertTable
+{
+private:
+    std::set<std::pair<std::string, int> > members;
+
+public:
+    CRPCConvertTable();
+
+    /**
+     * Adds new conversion to the conversion table
+     * @param method name of the method
+     * @param idx    0-based index of the paramter
+     */
+    void addConversion(const std::string& method, int idx);
+
+    /**
+     * Determines if a paramter should be handled as quoted or unquoted string
+     * @param method name of the method
+     * @param idx    0-based index of the paramter
+     * @return whether the paramter should be converted
+     */
+    bool convert(const std::string& method, int idx);
+};
+
+extern CRPCConvertTable rpcCvtTable;
+
 json_spirit::Array RPCConvertValues(const std::string& strMethod, const std::vector<std::string>& strParams);
 
 #endif // BITCOIN_RPCCLIENT_H
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
@@ -153,4 +153,28 @@ BOOST_AUTO_TEST_CASE(rpc_boostasiotocnetaddr)
     BOOST_CHECK_EQUAL(BoostAsioToCNetAddr(boost::asio::ip::address::from_string("::ffff:127.0.0.1")).ToString(), "127.0.0.1");
 }
 
+BOOST_AUTO_TEST_CASE(rpc_add_conversion)
+{
+    rpcCvtTable.addConversion("testcommand", 1);
+    rpcCvtTable.addConversion("testcommand", 2);
+
+    std::vector<std::string> vstrParams;
+
+    vstrParams.push_back("1234");
+    vstrParams.push_back("false");
+    vstrParams.push_back("481516");
+
+    Array params = RPCConvertValues("testcommand", vstrParams);
+
+    BOOST_CHECK_NO_THROW(params[0].get_str());
+    BOOST_CHECK_NO_THROW(params[1].get_bool());
+    BOOST_CHECK_NO_THROW(params[2].get_int());
+
+    BOOST_CHECK_THROW(params[0].get_int(), std::runtime_error);
+
+    BOOST_CHECK_EQUAL(params[0].get_str(), "1234");
+    BOOST_CHECK_EQUAL(params[1].get_bool(), false);
+    BOOST_CHECK_EQUAL(params[2].get_int(), 481516);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
