From 2f0b5a323f863734420fcd84607fc577497422fe Mon Sep 17 00:00:00 2001
From: cryptozoidberg <crypto.zoidberg@gmail.com>
Date: Wed, 20 Apr 2022 20:58:52 +0200
Subject: [PATCH] core tests fixes for TOR

---
 src/CMakeLists.txt                      | 12 +++++-------
 tests/core_tests/chaingen.cpp           |  1 +
 tests/core_tests/wallet_tests_basic.cpp |  1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e3465f9..da31da22 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,6 +130,10 @@ else()
   ENABLE_SHARED_PCH(wallet WALLET)
 endif()
 
+if(NOT DISABLE_TOR)
+  target_link_libraries(wallet tor-connect)
+endif()
+
 
 
 
@@ -158,7 +162,7 @@ target_link_libraries(currency_core lmdb mdbx)
 
 add_executable(daemon ${DAEMON} ${P2P} ${CURRENCY_PROTOCOL})
 add_dependencies(daemon version)
-  target_link_libraries(daemon rpc stratum currency_core crypto common libminiupnpc-static zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(daemon rpc stratum currency_core crypto common libminiupnpc-static zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 ENABLE_SHARED_PCH(daemon DAEMON)
 ENABLE_SHARED_PCH_EXECUTABLE(daemon)
                      
@@ -171,9 +175,6 @@ ENABLE_SHARED_PCH_EXECUTABLE(connectivity_tool)
 add_executable(simplewallet ${SIMPLEWALLET})
 add_dependencies(simplewallet version) 
 target_link_libraries(simplewallet wallet rpc currency_core crypto common zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
-  if(NOT DISABLE_TOR)
-    target_link_libraries(simplewallet tor-connect)
-  endif()
 
 ENABLE_SHARED_PCH(simplewallet SIMPLEWALLET)
 ENABLE_SHARED_PCH_EXECUTABLE(simplewallet)
@@ -199,9 +200,6 @@ if(BUILD_GUI)
   find_package(Qt5PrintSupport REQUIRED)
 
   target_link_libraries(Zano wallet rpc currency_core crypto common zlibstatic ethash Qt5::WebEngineWidgets Qt5::PrintSupport ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
-  if(NOT DISABLE_TOR)
-    target_link_libraries(Zano tor-connect)
-  endif()
   if (UNIX AND NOT APPLE)
 	target_link_libraries(Zano rt)
   endif()
diff --git a/tests/core_tests/chaingen.cpp b/tests/core_tests/chaingen.cpp
index 01aa5f8b..4ec33355 100644
--- a/tests/core_tests/chaingen.cpp
+++ b/tests/core_tests/chaingen.cpp
@@ -927,6 +927,7 @@ bool test_generator::init_test_wallet(const currency::account_base& account, con
   w->assign_account(account);
   w->set_genesis(genesis_hash);
   w->set_core_proxy(m_wallet_test_core_proxy);
+  w->set_disable_tor_relay(true);
 
   result = w;
   return true;
diff --git a/tests/core_tests/wallet_tests_basic.cpp b/tests/core_tests/wallet_tests_basic.cpp
index fe4ec260..a3d40912 100644
--- a/tests/core_tests/wallet_tests_basic.cpp
+++ b/tests/core_tests/wallet_tests_basic.cpp
@@ -83,6 +83,7 @@ std::shared_ptr<tools::wallet2> wallet_test::init_playtime_test_wallet(const std
   w->assign_account(acc);
   w->set_genesis(genesis_hash);
   w->set_core_proxy(m_core_proxy);
+  w->set_disable_tor_relay(true);
   return w;
 }