Revert base58_tests, add in script_tests.cpp (dashpay#35)

wagerr-builder · May 14, 2022 · 4a11316 · 4a11316
1 parent b98b707
commit 4a11316
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -81,6 +81,7 @@ BITCOIN_TESTS =\
   test/rpc_tests.cpp \
   test/sanity_tests.cpp \
   test/scheduler_tests.cpp \
+  test/script_tests.cpp \
   test/script_p2sh_tests.cpp \
   test/script_p2pk_tests.cpp \
   test/script_p2pkh_tests.cpp \

diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
@@ -12,18 +12,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-UniValue
-read_json(const std::string& jsondata)
-{
-    UniValue v;
-
-    if (!v.read(jsondata) || !v.isArray())
-    {
-        BOOST_ERROR("Parse error.");
-        return UniValue(UniValue::VARR);
-    }
-    return v.get_array();
-}
+extern UniValue read_json(const std::string& jsondata);
 
 BOOST_FIXTURE_TEST_SUITE(base58_tests, BasicTestingSetup)