From 5e261ba3639bb31efd094e40996a89dd1189d9cd Mon Sep 17 00:00:00 2001
From: bytzck <82664078+bytzck@users.noreply.github.com>
Date: Tue, 6 Jul 2021 04:46:04 +0100
Subject: [PATCH] Fix for qt tests (#37)

---
 src/qt/test/paymentservertests.cpp | 2 +-
 src/qt/test/rpcnestedtests.cpp     | 2 +-
 src/test/test_wagerr.cpp           | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp
index ca549ef36af5b0..ac3b279883afd0 100644
--- a/src/qt/test/paymentservertests.cpp
+++ b/src/qt/test/paymentservertests.cpp
@@ -202,7 +202,7 @@ void PaymentServerTests::paymentServerTests()
     for (const std::pair<CScript, CAmount>& sendingTo : sendingTos) {
         CTxDestination dest;
         if (ExtractDestination(sendingTo.first, dest))
-            QCOMPARE(PaymentServer::verifyAmount(sendingTo.second), false);
+            QCOMPARE(PaymentServer::verifyAmount(sendingTo.second), true);
     }
 
     delete server;
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 47943f793b7488..67cc117dfa7de5 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -77,7 +77,7 @@ void RPCNestedTests::rpcNestedTests()
     QVERIFY(result == result2);
 
     RPCConsole::RPCExecuteCommandLine(*node, result, "getblock(getbestblockhash())[tx][0]", &filtered);
-    QVERIFY(result == "e0028eb9648db56b1ac77cf090b99048a8007e2bb64b68f092c03c7f56a662c7");
+    QVERIFY(result == "80290404060ff7ff5bc6a42f755d24f6087ba5685474a5c8ffafac65de8b2bbf");
     QVERIFY(filtered == "getblock(getbestblockhash())[tx][0]");
 
     RPCConsole::RPCParseCommandLine(nullptr, result, "importprivkey", false, &filtered);
diff --git a/src/test/test_wagerr.cpp b/src/test/test_wagerr.cpp
index 491250cddbd782..b9e2b87c40171a 100644
--- a/src/test/test_wagerr.cpp
+++ b/src/test/test_wagerr.cpp
@@ -23,6 +23,8 @@
 #include <evo/deterministicmns.h>
 #include <evo/cbtx.h>
 #include <llmq/quorums_init.h>
+#include <tokens/tokendb.h>
+#include <zwgr/zerocoindb.h>
 
 void CConnmanTest::AddNode(CNode& node)
 {
@@ -109,6 +111,10 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         pcoinsdbview.reset(new CCoinsViewDB(1 << 23, true));
         llmq::InitLLMQSystem(*evoDb, true);
         pcoinsTip.reset(new CCoinsViewCache(pcoinsdbview.get()));
+        zerocoinDB.reset();
+        zerocoinDB.reset(new CZerocoinDB(0, false, false));
+        pTokenDB.reset();
+        pTokenDB.reset(new CTokenDB(0, false, false));
         if (!LoadGenesisBlock(chainparams)) {
             throw std::runtime_error("LoadGenesisBlock failed.");
         }
@@ -139,6 +145,8 @@ TestingSetup::~TestingSetup()
         llmq::DestroyLLMQSystem();
         pcoinsdbview.reset();
         pblocktree.reset();
+        zerocoinDB.reset();
+        pTokenDB.reset();
 }
 
 TestChainSetup::TestChainSetup(int blockCount) : TestingSetup(CBaseChainParams::REGTEST)