dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix slow_test compilation (#3997)

Browse source 
The slow_test target was broken by the previous commit. This fixes it to at least compile.

* rename request_interval_ms to request_interval_ms
* active_container::roots became private so some slow tests need to become friends of the class to access
This commit is contained in:
Dimitrios Siganos 2022-11-15 16:59:36 +02:00 • committed by GitHub
commit 403105a8ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nano/node/active_transactions.hpp
View file

@ -250,6 +250,9 @@ private:
public: // Tests public: // Tests
void clear (); void clear ();
friend class node_fork_storm_Test;
friend class system_block_sequence_Test;
friend class node_mass_block_new_Test;
friend class active_transactions_vote_replays_Test; friend class active_transactions_vote_replays_Test;
friend class frontiers_confirmation_prioritize_frontiers_Test; friend class frontiers_confirmation_prioritize_frontiers_Test;
friend class frontiers_confirmation_prioritize_frontiers_max_optimistic_elections_Test; friend class frontiers_confirmation_prioritize_frontiers_max_optimistic_elections_Test;

11
nano/slow_test/node.cpp
View file

@ -238,6 +238,8 @@ TEST (store, load)
} }
} }
namespace nano
{
TEST (node, fork_storm) TEST (node, fork_storm)
{ {
// WIP against issue #3709 // WIP against issue #3709
@ -342,6 +344,7 @@ TEST (node, fork_storm)
} }
ASSERT_TRUE (true); ASSERT_TRUE (true);
} }
} // namespace nano
namespace namespace
{ {
@ -1942,13 +1945,15 @@ TEST (node, mass_epoch_upgrader)
perform_test (std::numeric_limits<size_t>::max ()); perform_test (std::numeric_limits<size_t>::max ());
} }
namespace nano
{
TEST (node, mass_block_new) TEST (node, mass_block_new)
{ {
nano::test::system system; nano::test::system system;
nano::node_config node_config (nano::test::get_available_port (), system.logging); nano::node_config node_config (nano::test::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node = *system.add_node (node_config); auto & node = *system.add_node (node_config);
node.network_params.network.request_interval_ms = 500; node.network_params.network.aec_loop_interval_ms = 500;
#ifndef NDEBUG #ifndef NDEBUG
auto const num_blocks = 5000; auto const num_blocks = 5000;
@ -2069,6 +2074,7 @@ TEST (node, mass_block_new)
process_all (receive_blocks); process_all (receive_blocks);
std::cout << "Receive blocks time: " << timer.stop ().count () << " " << timer.unit () << "\n\n"; std::cout << "Receive blocks time: " << timer.stop ().count () << " " << timer.unit () << "\n\n";
} }
}
TEST (node, wallet_create_block_confirm_conflicts) TEST (node, wallet_create_block_confirm_conflicts)
{ {
@ -2125,6 +2131,8 @@ TEST (node, wallet_create_block_confirm_conflicts)
} }
} }
namespace nano
{
/** /**
* This test creates a small network of evenly weighted PRs and ensures a sequence of blocks from the genesis account to random accounts are able to be processed * This test creates a small network of evenly weighted PRs and ensures a sequence of blocks from the genesis account to random accounts are able to be processed
* Ongoing bootstrap is disabled to directly test election activation. A failure to activate a block on any PR will cause the test to stall * Ongoing bootstrap is disabled to directly test election activation. A failure to activate a block on any PR will cause the test to stall
@ -2228,3 +2236,4 @@ TEST (system, block_sequence)
system.poll (); system.poll ();
} }
} }
} // namespace nano