Updated tests post-fork

tests/src/block_template_tests.cpp

@@ -60,7 +60,7 @@ TEST(block_template, update)
 	tpl.update(data, mempool, &wallet);
 
 	const PoolBlock* b = tpl.pool_block_template();
-	ASSERT_EQ(b->m_sidechainId, H("0355a4eeb586ab4d30f3ba89f0ebf7ac1c34a55aebf1bee50af04ff893330280"));
+	ASSERT_EQ(b->m_sidechainId, H("2c90c1926a75c81afd49bf4a4b63e9de7b4c153866411c47e7af864b547c23ec"));
 
 	std::vector<uint8_t> blobs;
 	uint64_t height;
@@ -79,7 +79,7 @@ TEST(block_template, update)
 
 	hash blobs_hash;
 	keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
-	ASSERT_EQ(blobs_hash, H("70ee1661794c9a55f006432b57b0fc37922e0ccf8f1e4294b43890f8a6f44c62"));
+	ASSERT_EQ(blobs_hash, H("c043b754d043b4f6fe3f70273a937c77ff75a5afba9a6ca92776e79da28a1165"));
 
 	// Test 2: mempool with high fee and low fee transactions, it must choose high fee transactions
 	for (uint64_t i = 0; i < 512; ++i) {
@@ -92,7 +92,7 @@ TEST(block_template, update)
 
 	tpl.update(data, mempool, &wallet);
 
-	ASSERT_EQ(b->m_sidechainId, H("272a7eea0b804cf24427528977d221850d0ee06c26e935219a75f180cfbfc7f3"));
+	ASSERT_EQ(b->m_sidechainId, H("c9df4853003ab436416b9fc9a5a072d16b4dede849e697a8be2ebb9c88c8ec72"));
 	ASSERT_EQ(b->m_transactions.size(), 203);
 
 	for (size_t i = 1; i < b->m_transactions.size(); ++i) {
@@ -109,7 +109,7 @@ TEST(block_template, update)
 	ASSERT_EQ(template_id, 2U);
 
 	keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
-	ASSERT_EQ(blobs_hash, H("c74d295a9cb7e808030284e2169a6f05b685a11c6c577a774d5eb8fad175d5cd"));
+	ASSERT_EQ(blobs_hash, H("f00e196216d160a4fcbf468f748205039d276d62edfa6c6fd4c81dbd1f62d9b7"));
 
 	destroy_crypto_cache();
 }

tests/src/mm_test_config.json

@@ -1,8 +0,0 @@
-{
-	"name": "mm_test3",
-	"password": "",
-	"block_time": 10,
-	"min_diff": 100000,
-	"pplns_window": 216,
-	"uncle_penalty": 20
-}

tests/src/pool_block_tests.cpp

@@ -57,26 +57,26 @@ TEST(pool_block, deserialize)
 	int outputs_offset, outputs_blob_size;
 	const std::vector<uint8_t> mainchain_data = b.serialize_mainchain_data(&header_size, &miner_tx_size, &outputs_offset, &outputs_blob_size);
 
-	ASSERT_EQ(mainchain_data.size(), 1757U);
+	ASSERT_EQ(mainchain_data.size(), 1829U);
 	ASSERT_EQ(header_size, 43U);
-	ASSERT_EQ(miner_tx_size, 1457U);
+	ASSERT_EQ(miner_tx_size, 1145U);
 	ASSERT_EQ(outputs_offset, 54);
-	ASSERT_EQ(outputs_blob_size, 1371);
+	ASSERT_EQ(outputs_blob_size, 1058);
 
 	ASSERT_EQ(b.m_majorVersion, 16U);
 	ASSERT_EQ(b.m_minorVersion, 16U);
-	ASSERT_EQ(b.m_timestamp, 1679221824U);
-	ASSERT_EQ(b.m_nonce, 1247U);
-	ASSERT_EQ(b.m_txinGenHeight, 2845298U);
-	ASSERT_EQ(b.m_outputs.size(), 35U);
+	ASSERT_EQ(b.m_timestamp, 1728813765U);
+	ASSERT_EQ(b.m_nonce, 352454720U);
+	ASSERT_EQ(b.m_txinGenHeight, 3258099U);
+	ASSERT_EQ(b.m_outputs.size(), 27U);
 	ASSERT_EQ(b.m_extraNonceSize, 4U);
-	ASSERT_EQ(b.m_extraNonce, 1482827308U);
-	ASSERT_EQ(b.m_transactions.size(), 9U);
+	ASSERT_EQ(b.m_extraNonce, 2983923783U);
+	ASSERT_EQ(b.m_transactions.size(), 21U);
 	ASSERT_EQ(b.m_uncles.size(), 0U);
-	ASSERT_EQ(b.m_sidechainHeight, 4674483U);
-	ASSERT_EQ(b.m_difficulty.lo, 1854596983U);
+	ASSERT_EQ(b.m_sidechainHeight, 9443384U);
+	ASSERT_EQ(b.m_difficulty.lo, 1828732004U);
 	ASSERT_EQ(b.m_difficulty.hi, 0U);
-	ASSERT_EQ(b.m_cumulativeDifficulty.lo, 7172845253120126ull);
+	ASSERT_EQ(b.m_cumulativeDifficulty.lo, 15051095864465561ull);
 	ASSERT_EQ(b.m_cumulativeDifficulty.hi, 0U);
 	ASSERT_EQ(b.m_depth, 0U);
 	ASSERT_EQ(b.m_verified, false);
@@ -87,7 +87,7 @@ TEST(pool_block, deserialize)
 	hash seed;
 	{
 		std::stringstream s;
-		s << "6fc9c4a55eb513eb31955c084d9342e0082987f9e42da042449b7c9001176d3a";
+		s << "bf513dbe52c22b09e65edae222ec902d6adb75585a0141b81a165f0fb0c9c0bc";
 		s >> seed;
 	}
 
@@ -99,7 +99,7 @@ TEST(pool_block, deserialize)
 
 	std::stringstream s;
 	s << pow_hash;
-	ASSERT_EQ(s.str(), "aa7a3c4a2d67cb6a728e244288219bf038024f3b511b0da197a19ec601000000");
+	ASSERT_EQ(s.str(), "0906c001cc0900098fe1b62593f8ba52bd1ae2a0806096aa361a9f1702000000");
 
 	ASSERT_EQ(b.m_difficulty.check_pow(pow_hash), true);
 
@@ -118,16 +118,16 @@ TEST(pool_block, verify)
 		uint64_t m_sidechainHeight;
 		bool m_shuffle;
 	} tests[2] = {
-		{ "default", "sidechain_dump.dat", 2870010, 4957203, true },
-		{ "mini", "sidechain_dump_mini.dat", 2870010, 4414446, false },
+		{ "default", "sidechain_dump.dat", 3258121, 9443762, true },
+		{ "mini", "sidechain_dump_mini.dat", 3258121, 8912067, false },
 	};
 
 	for (const STest& t : tests)
 	{
 		SideChain sidechain(nullptr, NetworkType::Mainnet, t.m_poolName);
 
-		// Difficulty of block 2869248
-		sidechain.m_testMainChainDiff = difficulty_type(345786476185ULL, 0ULL);
+		// Difficulty of block 3256320
+		sidechain.m_testMainChainDiff = difficulty_type(374140388237ULL, 0ULL);
 
 		std::ifstream f(t.m_fileName, std::ios::binary | std::ios::ate);
 		ASSERT_EQ(f.good() && f.is_open(), true);