merging v25

nano/core_test/confirmation_solicitor.cpp

@@ -20,7 +20,7 @@ TEST (confirmation_solicitor, batches)
 	auto & node2 = *system.add_node (node_flags);
 	auto channel1 = nano::test::establish_tcp (system, node2, node1.network.endpoint ());
 	// Solicitor will only solicit from this representative
-	nano::representative representative (nano::dev::genesis_key.pub, nano::dev::constants.genesis_amount, channel1);
+	nano::representative representative (nano::dev::genesis_key.pub, channel1);
 	std::vector<nano::representative> representatives{ representative };
 	nano::confirmation_solicitor solicitor (node2.network, node2.config);
 	solicitor.prepare (representatives);
@@ -70,7 +70,7 @@ TEST (confirmation_solicitor, different_hash)
 	auto & node2 = *system.add_node (node_flags);
 	auto channel1 = nano::test::establish_tcp (system, node2, node1.network.endpoint ());
 	// Solicitor will only solicit from this representative
-	nano::representative representative (nano::dev::genesis_key.pub, nano::dev::constants.genesis_amount, channel1);
+	nano::representative representative (nano::dev::genesis_key.pub, channel1);
 	std::vector<nano::representative> representatives{ representative };
 	nano::confirmation_solicitor solicitor (node2.network, node2.config);
 	solicitor.prepare (representatives);
@@ -117,7 +117,7 @@ TEST (confirmation_solicitor, bypass_max_requests_cap)
 	{
 		// Make a temporary channel associated with node2
 		auto channel = std::make_shared<nano::transport::inproc::channel> (node2, node2);
-		nano::representative representative (nano::account (i), i, channel);
+		nano::representative representative{ nano::account (i), channel };
 		representatives.push_back (representative);
 	}
 	ASSERT_EQ (max_representatives + 1, representatives.size ());