2 files changed, 22 insertions, 9 deletions
diff --git a/tests/core_tests/chaingen.cpp b/tests/core_tests/chaingen.cpp
index 3f2984288..35e449e10 100644
--- a/tests/core_tests/chaingen.cpp
+++ b/tests/core_tests/chaingen.cpp
@@ -186,7 +186,9 @@ bool test_generator::construct_block(cryptonote::block& blk, uint64_t height, co
 
   // Nonce search...
   blk.nonce = 0;
-  while (!miner::find_nonce_for_given_block(NULL, blk, get_test_difficulty(hf_ver), height))
+  while (!miner::find_nonce_for_given_block([](const cryptonote::block &b, uint64_t height, unsigned int threads, crypto::hash &hash){
+    return cryptonote::get_block_longhash(NULL, b, hash, height, threads);
+  }, blk, get_test_difficulty(hf_ver), height))
     blk.timestamp++;
 
   add_block(blk, txs_weight, block_weights, already_generated_coins, hf_ver ? hf_ver.get() : 1);
@@ -797,7 +799,9 @@ void fill_tx_sources_and_destinations(const std::vector<test_event_entry>& event
 void fill_nonce(cryptonote::block& blk, const difficulty_type& diffic, uint64_t height)
 {
   blk.nonce = 0;
-  while (!miner::find_nonce_for_given_block(NULL, blk, diffic, height))
+  while (!miner::find_nonce_for_given_block([](const cryptonote::block &b, uint64_t height, unsigned int threads, crypto::hash &hash){
+    return cryptonote::get_block_longhash(NULL, b, hash, height, threads);
+  }, blk, diffic, height))
     blk.timestamp++;
 }
 
diff --git a/tests/unit_tests/node_server.cpp b/tests/unit_tests/node_server.cpp
index 2c89323c7..5f91fc6d4 100644
--- a/tests/unit_tests/node_server.cpp
+++ b/tests/unit_tests/node_server.cpp
@@ -262,16 +262,25 @@ TEST(ban, ignores_port)
 
 TEST(node_server, bind_same_p2p_port)
 {
-  const auto new_node = []() -> std::unique_ptr<Server> {
+  struct test_data_t
+  {
     test_core pr_core;
-    cryptonote::t_cryptonote_protocol_handler<test_core> cprotocol(pr_core, NULL);
-    std::unique_ptr<Server> server(new Server(cprotocol));
-    cprotocol.set_p2p_endpoint(server.get());
+    cryptonote::t_cryptonote_protocol_handler<test_core> cprotocol;
+    std::unique_ptr<Server> server;
+
+    test_data_t(): cprotocol(pr_core, NULL)
+    {
+      server.reset(new Server(cprotocol));
+      cprotocol.set_p2p_endpoint(server.get());
+    }
+  };
 
-    return server;
+  const auto new_node = []() -> std::unique_ptr<test_data_t> {
+    test_data_t *d = new test_data_t;
+    return std::unique_ptr<test_data_t>(d);
   };
 
-  const auto init = [](const std::unique_ptr<Server>& server, const char* port) -> bool {
+  const auto init = [](const std::unique_ptr<test_data_t>& server, const char* port) -> bool {
     boost::program_options::options_description desc_options("Command line options");
     cryptonote::core::init_options(desc_options);
     Server::init_options(desc_options);
@@ -284,7 +293,7 @@ TEST(node_server, bind_same_p2p_port)
 
     boost::program_options::notify(vm);
 
-    return server->init(vm);
+    return server->server->init(vm);
   };
 
   constexpr char port[] = "48080";