From c8762e77df0246965f88049bae31f7432ec99cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?=
 <3044353+pwojcikdev@users.noreply.github.com>
Date: Tue, 8 Jul 2025 17:48:18 +0200
Subject: [PATCH] Fix tests

---
 nano/core_test/block_store.cpp | 31 ++++++++++---------------------
 nano/store/component.hpp       |  1 -
 nano/store/lmdb/lmdb.hpp       |  4 ----
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp
index a7fe1b44..63600140 100644
--- a/nano/core_test/block_store.cpp
+++ b/nano/core_test/block_store.cpp
@@ -612,8 +612,7 @@ TEST (block_store, latest_find)
 	ASSERT_EQ (second, find3);
 }
 
-namespace nano::store::lmdb
-{
+// TODO: Move to lmdb specific test file
 TEST (mdb_block_store, supported_version_upgrades)
 {
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
@@ -636,7 +635,7 @@ TEST (mdb_block_store, supported_version_upgrades)
 
 	// Upgrade should fail
 	{
-		nano::store::lmdb::component store (logger, path, nano::dev::constants);
+		ASSERT_THROW (nano::store::lmdb::component store (logger, path, nano::dev::constants), std::runtime_error);
 	}
 
 	auto path1 (nano::unique_path () / "data.ldb");
@@ -652,11 +651,11 @@ TEST (mdb_block_store, supported_version_upgrades)
 
 	// Upgrade should work
 	{
-		nano::store::lmdb::component store (logger, path1, nano::dev::constants);
+		ASSERT_NO_THROW (nano::store::lmdb::component store (logger, path1, nano::dev::constants));
 	}
 }
-}
 
+// TODO: Move to lmdb specific test file
 TEST (mdb_block_store, bad_path)
 {
 	if (nano::rocksdb_config::using_rocksdb_in_tests ())
@@ -665,21 +664,13 @@ TEST (mdb_block_store, bad_path)
 		GTEST_SKIP ();
 	}
 	nano::logger logger;
-	try
+	auto path = nano::unique_path ();
+	path /= "data.ldb";
 	{
-		auto path = nano::unique_path ();
-		path /= "data.ldb";
-		{
-			std::ofstream stream (path.c_str ());
-		}
-		std::filesystem::permissions (path, std::filesystem::perms::none);
-		nano::store::lmdb::component store (logger, path, nano::dev::constants);
+		std::ofstream stream (path.c_str ());
 	}
-	catch (std::runtime_error &)
-	{
-		return;
-	}
-	ASSERT_TRUE (false);
+	std::filesystem::permissions (path, std::filesystem::perms::none);
+	ASSERT_THROW (nano::store::lmdb::component store (logger, path, nano::dev::constants), std::runtime_error);
 }
 
 TEST (block_store, DISABLED_already_open) // File can be shared
@@ -1614,9 +1605,7 @@ TEST (block_store, incompatible_version)
 	}
 
 	// Now try and read it, should give an error
-	{
-		auto store = nano::make_store (logger, path, nano::dev::constants, true);
-	}
+	ASSERT_THROW (nano::make_store (logger, path, nano::dev::constants, true), std::runtime_error);
 }
 
 TEST (block_store, reset_renew_existing_transaction)
diff --git a/nano/store/component.hpp b/nano/store/component.hpp
index 29f4554b..7a5b79b6 100644
--- a/nano/store/component.hpp
+++ b/nano/store/component.hpp
@@ -34,7 +34,6 @@ namespace store
 	class component
 	{
 		friend class rocksdb_block_store_tombstone_count_Test;
-		friend class mdb_block_store_upgrade_v21_v22_Test;
 
 	public:
 		explicit component (
diff --git a/nano/store/lmdb/lmdb.hpp b/nano/store/lmdb/lmdb.hpp
index 8e975409..fd5a6797 100644
--- a/nano/store/lmdb/lmdb.hpp
+++ b/nano/store/lmdb/lmdb.hpp
@@ -136,10 +136,6 @@ private:
 		uint64_t after_v0{ 0 };
 		uint64_t after_v1{ 0 };
 	};
-
-	friend class mdb_block_store_supported_version_upgrades_Test;
-	friend class mdb_block_store_upgrade_v21_v22_Test;
-	friend class block_store_DISABLED_change_dupsort_Test;
 };
 
 bool success (int status);