Assert conversions part 2 (#4376)

nano/core_test/node.cpp

@@ -25,7 +25,7 @@ TEST (node, null_account)
 
 	nano::account default_account{};
 	ASSERT_FALSE (default_account == nullptr);
-	ASSERT_TRUE (default_account != nullptr);
+	ASSERT_NE (default_account, nullptr);
 }
 
 TEST (node, stop)
@@ -47,7 +47,7 @@ TEST (node, work_generate)
 		auto difficulty = nano::difficulty::from_multiplier (1.5, node.network_params.work.base);
 		auto work = node.work_generate_blocking (version, root, difficulty);
 		ASSERT_TRUE (work.is_initialized ());
-		ASSERT_TRUE (nano::dev::network_params.work.difficulty (version, root, *work) >= difficulty);
+		ASSERT_GE (nano::dev::network_params.work.difficulty (version, root, *work), difficulty);
 	}
 	{
 		auto difficulty = nano::difficulty::from_multiplier (0.5, node.network_params.work.base);
@@ -57,7 +57,7 @@ TEST (node, work_generate)
 			work = node.work_generate_blocking (version, root, difficulty);
 		} while (nano::dev::network_params.work.difficulty (version, root, *work) >= node.network_params.work.base);
 		ASSERT_TRUE (work.is_initialized ());
-		ASSERT_TRUE (nano::dev::network_params.work.difficulty (version, root, *work) >= difficulty);
+		ASSERT_GE (nano::dev::network_params.work.difficulty (version, root, *work), difficulty);
 		ASSERT_FALSE (nano::dev::network_params.work.difficulty (version, root, *work) >= node.network_params.work.base);
 	}
 }

nano/core_test/socket.cpp

@@ -115,7 +115,7 @@ TEST (socket, max_connections_per_ip)
 	auto server_port = system.get_available_port ();
 
 	const auto max_ip_connections = node->network_params.network.max_peers_per_ip;
-	ASSERT_TRUE (max_ip_connections >= 1);
+	ASSERT_GE (max_ip_connections, 1);
 
 	const auto max_global_connections = 1000;
 
@@ -235,7 +235,7 @@ TEST (socket, max_connections_per_subnetwork)
 	boost::asio::ip::tcp::endpoint listen_endpoint{ boost::asio::ip::address_v6::any (), server_port };
 
 	const auto max_subnetwork_connections = node->network_params.network.max_peers_per_subnetwork;
-	ASSERT_TRUE (max_subnetwork_connections >= 1);
+	ASSERT_GE (max_subnetwork_connections, 1);
 
 	const auto max_global_connections = 1000;
 
@@ -295,7 +295,7 @@ TEST (socket, disabled_max_peers_per_ip)
 	auto server_port = system.get_available_port ();
 
 	const auto max_ip_connections = node->network_params.network.max_peers_per_ip;
-	ASSERT_TRUE (max_ip_connections >= 1);
+	ASSERT_GE (max_ip_connections, 1);
 
 	const auto max_global_connections = 1000;
 

nano/core_test/uint256_union.cpp

@@ -614,7 +614,7 @@ TEST (random_pool, generate_word64)
 
 	for (auto i = 1; i < 10; ++i)
 	{
-		ASSERT_TRUE (occurrences[i] > 0);
+		ASSERT_GT (occurrences[i], 0);
 	}
 }
 
@@ -624,5 +624,5 @@ TEST (random_pool, generate_word64_big_number)
 	uint64_t min = static_cast<uint64_t> (std::numeric_limits<uint32_t>::max ()) + 1;
 	uint64_t max = std::numeric_limits<uint64_t>::max ();
 	auto big_random = nano::random_pool::generate_word64 (min, max);
-	ASSERT_TRUE (big_random >= min);
+	ASSERT_GE (big_random, min);
 }

nano/rpc_test/rpc.cpp

@@ -6617,7 +6617,7 @@ TEST (rpc, receive_work_disabled)
 	nano::keypair key1;
 	ASSERT_TRUE (worker_node.work_generation_enabled ());
 	auto send1 (wallet->send_action (nano::dev::genesis_key.pub, key1.pub, node->config.receive_minimum.number () - 1, *worker_node.work_generate_blocking (nano::dev::genesis->hash ()), false));
-	ASSERT_TRUE (send1 != nullptr);
+	ASSERT_NE (send1, nullptr);
 	ASSERT_TIMELY (5s, node->balance (nano::dev::genesis_key.pub) != nano::dev::constants.genesis_amount);
 	ASSERT_FALSE (node->store.account.exists (node->store.tx_begin_read (), key1.pub));
 	ASSERT_TRUE (node->store.block.exists (node->store.tx_begin_read (), send1->hash ()));

nano/slow_test/vote_processor.cpp

@@ -75,5 +75,5 @@ TEST (vote_processor, producer_consumer)
 	consumer_thread.join ();
 	monitor_thread.join ();
 
-	ASSERT_TRUE (producer_wins > consumer_wins);
+	ASSERT_GT (producer_wins, consumer_wins);
 }