Merge pull request bitcoin#41 from jgarzik/get-obj-map

Add getObjMap() helper method. Also, constify checkObject().
KolbyML · Sep 24, 2017 · 8a2d6f1 · 8a2d6f1
2 parents ceb1194 + ba341a2
commit 8a2d6f1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/include/univalue.h b/include/univalue.h
@@ -70,7 +70,8 @@ class UniValue {
     size_t size() const { return values.size(); }
 
     bool getBool() const { return isTrue(); }
-    bool checkObject(const std::map<std::string,UniValue::VType>& memberTypes);
+    void getObjMap(std::map<std::string,UniValue>& kv) const;
+    bool checkObject(const std::map<std::string,UniValue::VType>& memberTypes) const;
     const UniValue& operator[](const std::string& key) const;
     const UniValue& operator[](size_t index) const;
     bool exists(const std::string& key) const { size_t i; return findKey(key, i); }

diff --git a/lib/univalue.cpp b/lib/univalue.cpp
@@ -156,6 +156,16 @@ bool UniValue::pushKVs(const UniValue& obj)
     return true;
 }
 
+void UniValue::getObjMap(std::map<std::string,UniValue>& kv) const
+{
+    if (typ != VOBJ)
+        return;
+
+    kv.clear();
+    for (size_t i = 0; i < keys.size(); i++)
+        kv[keys[i]] = values[i];
+}
+
 bool UniValue::findKey(const std::string& key, size_t& retIdx) const
 {
     for (size_t i = 0; i < keys.size(); i++) {
@@ -168,7 +178,7 @@ bool UniValue::findKey(const std::string& key, size_t& retIdx) const
     return false;
 }
 
-bool UniValue::checkObject(const std::map<std::string,UniValue::VType>& t)
+bool UniValue::checkObject(const std::map<std::string,UniValue::VType>& t) const
 {
     if (typ != VOBJ)
         return false;

diff --git a/test/object.cpp b/test/object.cpp
@@ -324,6 +324,14 @@ BOOST_AUTO_TEST_CASE(univalue_object)
     obj.pushKV("age", uv);
     BOOST_CHECK_EQUAL(obj.size(), 1);
     BOOST_CHECK_EQUAL(obj["age"].getValStr(), "43");
+
+    obj.pushKV("name", "foo bar");
+
+    std::map<std::string,UniValue> kv;
+    obj.getObjMap(kv);
+    BOOST_CHECK_EQUAL(kv["age"].getValStr(), "43");
+    BOOST_CHECK_EQUAL(kv["name"].getValStr(), "foo bar");
+
 }
 
 static const char *json1 =