Squashed 'src/univalue/' changes from 98261b1e7b..98fadc0909

MarcoFalke · MarcoFalke · commit 2a55a0ed3055 · 2020-11-19T15:47:07.000+01:00
98fadc0909 Merge bitcoin#24: Push bool into array correctly 5f03f1f39a Push bool into array correctly git-subtree-dir: src/univalue git-subtree-split: 98fadc090984fa7e070b6c41ccb514f69a371c85
diff --git a/include/univalue.h b/include/univalue.h
@@ -100,6 +100,10 @@ class UniValue {
         UniValue tmpVal(val_);
         return push_back(tmpVal);
     }
+    bool push_back(bool val_) {
+        UniValue tmpVal(val_);
+        return push_back(tmpVal);
+    }
     bool push_back(int val_) {
         UniValue tmpVal(val_);
         return push_back(tmpVal);
@@ -129,7 +133,7 @@ class UniValue {
         return pushKV(key, tmpVal);
     }
     bool pushKV(const std::string& key, bool val_) {
-        UniValue tmpVal((bool)val_);
+        UniValue tmpVal(val_);
         return pushKV(key, tmpVal);
     }
     bool pushKV(const std::string& key, int val_) {
diff --git a/test/object.cpp b/test/object.cpp
@@ -210,19 +210,31 @@ BOOST_AUTO_TEST_CASE(univalue_array)
     BOOST_CHECK(arr.push_back((int64_t) -400LL));
     BOOST_CHECK(arr.push_back((int) -401));
     BOOST_CHECK(arr.push_back(-40.1));
+    BOOST_CHECK(arr.push_back(true));
 
     BOOST_CHECK_EQUAL(arr.empty(), false);
-    BOOST_CHECK_EQUAL(arr.size(), 9);
+    BOOST_CHECK_EQUAL(arr.size(), 10);
 
     BOOST_CHECK_EQUAL(arr[0].getValStr(), "1023");
+    BOOST_CHECK_EQUAL(arr[0].getType(), UniValue::VNUM);
     BOOST_CHECK_EQUAL(arr[1].getValStr(), "zippy");
+    BOOST_CHECK_EQUAL(arr[1].getType(), UniValue::VSTR);
     BOOST_CHECK_EQUAL(arr[2].getValStr(), "pippy");
+    BOOST_CHECK_EQUAL(arr[2].getType(), UniValue::VSTR);
     BOOST_CHECK_EQUAL(arr[3].getValStr(), "boing");
+    BOOST_CHECK_EQUAL(arr[3].getType(), UniValue::VSTR);
     BOOST_CHECK_EQUAL(arr[4].getValStr(), "going");
+    BOOST_CHECK_EQUAL(arr[4].getType(), UniValue::VSTR);
     BOOST_CHECK_EQUAL(arr[5].getValStr(), "400");
+    BOOST_CHECK_EQUAL(arr[5].getType(), UniValue::VNUM);
     BOOST_CHECK_EQUAL(arr[6].getValStr(), "-400");
+    BOOST_CHECK_EQUAL(arr[6].getType(), UniValue::VNUM);
     BOOST_CHECK_EQUAL(arr[7].getValStr(), "-401");
+    BOOST_CHECK_EQUAL(arr[7].getType(), UniValue::VNUM);
     BOOST_CHECK_EQUAL(arr[8].getValStr(), "-40.1");
+    BOOST_CHECK_EQUAL(arr[8].getType(), UniValue::VNUM);
+    BOOST_CHECK_EQUAL(arr[9].getValStr(), "1");
+    BOOST_CHECK_EQUAL(arr[9].getType(), UniValue::VBOOL);
 
     BOOST_CHECK_EQUAL(arr[999].getValStr(), "");
 

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,10 @@ class UniValue {`
`100`	`100`	`UniValue tmpVal(val_);`
`101`	`101`	`return push_back(tmpVal);`
`102`	`102`	`}`
	`103`	`+ bool push_back(bool val_) {`
	`104`	`+ UniValue tmpVal(val_);`
	`105`	`+ return push_back(tmpVal);`
	`106`	`+ }`
`103`	`107`	`bool push_back(int val_) {`
`104`	`108`	`UniValue tmpVal(val_);`
`105`	`109`	`return push_back(tmpVal);`
`@@ -129,7 +133,7 @@ class UniValue {`
`129`	`133`	`return pushKV(key, tmpVal);`
`130`	`134`	`}`
`131`	`135`	`bool pushKV(const std::string& key, bool val_) {`
`132`		`- UniValue tmpVal((bool)val_);`
	`136`	`+ UniValue tmpVal(val_);`
`133`	`137`	`return pushKV(key, tmpVal);`
`134`	`138`	`}`
`135`	`139`	`bool pushKV(const std::string& key, int val_) {`