Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

active_transactions test cleanup #2012

Merged
merged 1 commit into from
May 22, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions nano/core_test/active_transactions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ TEST (active_transactions, adjusted_difficulty_priority)
nano::node_config node_config (24000, system.logging);
node_config.enable_voting = false;
auto & node1 = *system.add_node (node_config);
auto & wallet (*system.wallet (0));
nano::genesis genesis;
nano::keypair key1, key2, key3;
auto transaction (node1.store.tx_begin_read ());
Expand Down Expand Up @@ -147,10 +146,12 @@ TEST (active_transactions, adjusted_difficulty_priority)

TEST (active_transactions, keep_local)
{
//delay_frontier_confirmation_height_updating to allow the test to before
bool delay_frontier_confirmation_height_updating = true;
nano::system system;
nano::node_config node_config (24000, system.logging);
node_config.enable_voting = false;
auto & node1 = *system.add_node (node_config);
auto & node1 = *system.add_node (node_config, delay_frontier_confirmation_height_updating);
auto & wallet (*system.wallet (0));
nano::genesis genesis;
//key 1/2 will be managed by the wallet
Expand Down Expand Up @@ -208,11 +209,12 @@ TEST (active_transactions, keep_local)

TEST (active_transactions, prioritize_chains)
{
//delay_frontier_confirmation_height_updating to allow the test to before
bool delay_frontier_confirmation_height_updating = true;
nano::system system;
nano::node_config node_config (24000, system.logging);
node_config.enable_voting = false;
auto & node1 = *system.add_node (node_config);
auto & wallet (*system.wallet (0));
auto & node1 = *system.add_node (node_config, delay_frontier_confirmation_height_updating);
nano::genesis genesis;
nano::keypair key1, key2, key3;

Expand Down