From cce1a50a536896ccb00f498daef95dbf0452a2e3 Mon Sep 17 00:00:00 2001
From: bytzck <82664078+bytzck@users.noreply.github.com>
Date: Tue, 22 Jun 2021 16:47:24 +0100
Subject: [PATCH] Revert base58_tests, add in script_tests.cpp (#35)

---
 src/Makefile.test.include |  1 +
 src/test/base58_tests.cpp | 13 +------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 53f1684ff0d71..14f3e67e8c001 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -281,6 +281,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
index a71447af212ac..c7dc854fef19e 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -13,18 +13,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)