Migrate Zcash-specific code to UniValue

2017-01-06 19:15:56 +01:00
parent f70084cf06
commit 0d37ae3a59
19 changed files with 258 additions and 279 deletions
--- a/src/gtest/json_test_vectors.cpp
+++ b/src/gtest/json_test_vectors.cpp
@@ -1,14 +1,14 @@
 #include "json_test_vectors.h"

-Array
+UniValue
 read_json(const std::string& jsondata)
 {
-    Value v;
+    UniValue v;

-    if (!read_string(jsondata, v) || v.type() != array_type)
+    if (!(v.read(jsondata) && v.isArray()))
    {
        ADD_FAILURE();
-        return Array();
+        return UniValue(UniValue::VARR);
    }
    return v.get_array();
 }