Rename config() -> setup_test()

e2e-tests/src/config.rs

@@ -13,7 +13,7 @@ static GLOBAL_CONFIG: Lazy<Config> = Lazy::new(|| {
     Config::parse_from(unparsed.split_whitespace())
 });
 
-pub fn config() -> &'static Config {
+pub fn setup_test() -> &'static Config {
     let _ = env_logger::builder().is_test(true).try_init();
     &GLOBAL_CONFIG
 }

e2e-tests/src/test/ban.rs

@@ -22,7 +22,7 @@ use crate::{
         check_underperformed_count_for_sessions, check_underperformed_validator_reason,
         check_underperformed_validator_session_count, check_validators, setup_test,
     },
-    config::config,
+    config,
     rewards::set_invalid_keys_for_validator,
 };
 
@@ -57,7 +57,7 @@ async fn disable_validator(validator_address: &str, validator_seed: u32) -> anyh
 #[tokio::test]
 #[ignore]
 pub async fn ban_automatic() -> anyhow::Result<()> {
-    let config = config();
+    let config = config::setup_test();
     let (root_connection, reserved_validators, non_reserved_validators, _) =
         setup_test(config).await?;
 
@@ -144,7 +144,7 @@ pub async fn ban_automatic() -> anyhow::Result<()> {
 /// fact been banned for the given reason.
 #[tokio::test]
 pub async fn ban_manual() -> anyhow::Result<()> {
-    let config = config();
+    let config = config::setup_test();
     let (root_connection, reserved_validators, non_reserved_validators, _) =
         setup_test(config).await?;
 
@@ -229,7 +229,7 @@ pub async fn ban_manual() -> anyhow::Result<()> {
 /// and his underperformed session count is less or equal to 2.
 #[tokio::test]
 pub async fn clearing_session_count() -> anyhow::Result<()> {
-    let config = config();
+    let config = config::setup_test();
     let (root_connection, reserved_validators, non_reserved_validators, _) =
         setup_test(config).await?;
 
@@ -277,7 +277,7 @@ pub async fn clearing_session_count() -> anyhow::Result<()> {
 /// committee marked as ones in which they underperformed.
 #[tokio::test]
 pub async fn ban_threshold() -> anyhow::Result<()> {
-    let config = config();
+    let config = config::setup_test();
     let (root_connection, reserved_validators, non_reserved_validators, seats) =
         setup_test(config).await?;
 

e2e-tests/src/test/electing_validators.rs

@@ -14,7 +14,7 @@ use log::info;
 use primitives::EraIndex;
 
 use crate::{
-    config::config,
+    config::setup_test,
     validators::{prepare_validators, setup_accounts},
 };
 
@@ -149,7 +149,7 @@ async fn chill_validators(node: &str, chilling: Vec<KeyPair>) {
 /// satisfies the outlined conditions.
 #[tokio::test]
 pub async fn authorities_are_staking() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
 
     let node = &config.node;
     let root_connection = config.create_root_connection().await;

e2e-tests/src/test/era_payout.rs

@@ -8,11 +8,11 @@ use primitives::{
     MILLISECS_PER_BLOCK,
 };
 
-use crate::config::{config, Config};
+use crate::config::{setup_test, Config};
 
 #[tokio::test]
 pub async fn era_payouts_calculated_correctly() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     normal_era_payout(config).await?;
     force_era_payout(config).await?;
 

e2e-tests/src/test/era_validators.rs

@@ -8,7 +8,7 @@ use aleph_client::{
 
 use crate::{
     accounts::{account_ids_from_keys, get_validators_raw_keys},
-    config::{config, Config},
+    config::{setup_test, Config},
 };
 
 fn get_initial_reserved_validators(config: &Config) -> Vec<KeyPair> {
@@ -60,7 +60,7 @@ async fn get_current_and_next_era_non_reserved_validators(
 
 #[tokio::test]
 pub async fn era_validators() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let connection = config.get_first_signed_connection().await;
     let root_connection = config.create_root_connection().await;
 

e2e-tests/src/test/fee.rs

@@ -8,11 +8,11 @@ use log::info;
 use primitives::Balance;
 use sp_runtime::{FixedPointNumber, FixedU128};
 
-use crate::{config::config, transfer::setup_for_transfer};
+use crate::{config::setup_test, transfer::setup_for_transfer};
 
 #[tokio::test]
 pub async fn fee_calculation() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     // An initial transfer is needed to establish the fee multiplier.
     let (connection, to) = setup_for_transfer(config).await;
     let root_connection = config.create_root_connection().await;

e2e-tests/src/test/finalization.rs

@@ -3,11 +3,11 @@ use aleph_client::{
     waiting::{AlephWaiting, BlockStatus},
 };
 
-use crate::config::config;
+use crate::config::setup_test;
 
 #[tokio::test]
 pub async fn finalization() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let connection = config.create_root_connection().await;
 
     let finalized = connection.connection.get_finalized_block_hash().await;

e2e-tests/src/test/rewards.rs

@@ -12,7 +12,7 @@ use log::info;
 use primitives::{staking::MIN_VALIDATOR_BOND, EraIndex, SessionIndex};
 
 use crate::{
-    config::config,
+    config::setup_test,
     elections::get_and_test_members_for_session,
     rewards::{
         check_points, reset_validator_keys, set_invalid_keys_for_validator, setup_validators,
@@ -27,7 +27,7 @@ const MAX_DIFFERENCE: f64 = 0.07;
 
 #[tokio::test]
 pub async fn points_basic() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let (era_validators, committee_size, start_session) = setup_validators(config).await?;
 
     let connection = config.get_first_signed_connection().await;
@@ -76,7 +76,7 @@ pub async fn points_basic() -> anyhow::Result<()> {
 /// are calculated correctly afterward.
 #[tokio::test]
 pub async fn points_stake_change() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let (era_validators, committee_size, _) = setup_validators(config).await?;
 
     validators_bond_extra_stakes(
@@ -137,7 +137,7 @@ pub async fn points_stake_change() -> anyhow::Result<()> {
 /// and checks that reward points are calculated correctly afterward.
 #[tokio::test]
 pub async fn disable_node() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let (era_validators, committee_size, start_session) = setup_validators(config).await?;
 
     let root_connection = config.create_root_connection().await;
@@ -195,7 +195,7 @@ pub async fn disable_node() -> anyhow::Result<()> {
 /// the call, when the new era has already begun.
 #[tokio::test]
 pub async fn force_new_era() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let (era_validators, committee_size, start_session) = setup_validators(config).await?;
 
     let connection = config.get_first_signed_connection().await;
@@ -239,7 +239,7 @@ pub async fn force_new_era() -> anyhow::Result<()> {
 /// stakes.
 #[tokio::test]
 pub async fn change_stake_and_force_new_era() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let (era_validators, committee_size, start_session) = setup_validators(config).await?;
 
     let connection = config.get_first_signed_connection().await;

e2e-tests/src/test/staking.rs

@@ -21,7 +21,7 @@ use primitives::{
 
 use crate::{
     accounts::{account_ids_from_keys, accounts_seeds_to_keys, get_validators_seeds},
-    config::{config, Config},
+    config::{setup_test, Config},
 };
 
 fn get_validator_stashes_key_pairs(config: &Config) -> (Vec<KeyPair>, Vec<KeyPair>) {
@@ -43,7 +43,7 @@ fn get_validator_stashes_key_pairs(config: &Config) -> (Vec<KeyPair>, Vec<KeyPai
 // 5. send payout stakers tx
 #[tokio::test]
 pub async fn staking_era_payouts() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let (stashes_accounts_key_pairs, validator_accounts) = get_validator_stashes_key_pairs(config);
 
     let node = &config.node;
@@ -110,7 +110,7 @@ pub async fn staking_era_payouts() -> anyhow::Result<()> {
 // 9. claim rewards for the stash account
 #[tokio::test]
 pub async fn staking_new_validator() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let controller_seed = "//Controller";
     let controller = keypair_from_string(controller_seed);
     let controller_account = AccountId::from(controller.signer().public());

e2e-tests/src/test/transfer.rs

@@ -4,11 +4,11 @@ use aleph_client::{
 };
 use log::info;
 
-use crate::{config::config, transfer::setup_for_transfer};
+use crate::{config::setup_test, transfer::setup_for_transfer};
 
 #[tokio::test]
 pub async fn token_transfer() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let (connection, to) = setup_for_transfer(config).await;
 
     let balance_before = connection

e2e-tests/src/test/treasury.rs

@@ -13,7 +13,7 @@ use log::info;
 use primitives::Balance;
 
 use crate::{
-    accounts::get_validators_raw_keys, config::config, test::fee::current_fees,
+    accounts::get_validators_raw_keys, config::setup_test, test::fee::current_fees,
     transfer::setup_for_transfer,
 };
 
@@ -35,7 +35,7 @@ async fn balance_info(connection: &Connection) -> (Balance, Balance) {
 
 #[tokio::test]
 pub async fn channeling_fee_and_tip() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let (transfer_amount, tip) = (1_000u128, 10_000u128);
     let (connection, to) = setup_for_transfer(config).await;
 
@@ -104,7 +104,7 @@ fn check_treasury_balance(
 
 #[tokio::test]
 pub async fn treasury_access() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let proposer = KeyPair::new(get_validators_raw_keys(config)[0].clone());
     let beneficiary = account_from_keypair(proposer.signer());
     let connection = SignedConnection::new(config.node.clone(), proposer).await;

e2e-tests/src/test/utility.rs

@@ -2,11 +2,11 @@ use std::iter::repeat;
 
 use aleph_client::{pallets::balances::BalanceUserBatchExtApi, TxStatus};
 
-use crate::{config::config, transfer::setup_for_transfer};
+use crate::{config::setup_test, transfer::setup_for_transfer};
 
 #[tokio::test]
 pub async fn batch_transactions() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     const NUMBER_OF_TRANSACTIONS: usize = 100;
 
     let (connection, to) = setup_for_transfer(config).await;

e2e-tests/src/test/validators_change.rs

@@ -8,11 +8,11 @@ use aleph_client::{
 };
 use log::info;
 
-use crate::{accounts::get_validators_keys, config::config};
+use crate::{accounts::get_validators_keys, config::setup_test};
 
 #[tokio::test]
 pub async fn change_validators() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
 
     let accounts = get_validators_keys(config);
     let connection = config.create_root_connection().await;

e2e-tests/src/test/validators_rotate.rs

@@ -9,15 +9,15 @@ use aleph_client::{
 };
 
 use crate::{
-    accounts::account_ids_from_keys, config::config, elections::get_members_subset_for_session,
+    accounts::account_ids_from_keys, config::setup_test, elections::get_members_subset_for_session,
     validators::get_test_validators,
 };
 
 const TEST_LENGTH: u32 = 5;
 
 #[tokio::test]
 pub async fn validators_rotate() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let connection = config.get_first_signed_connection().await;
     let root_connection = config.create_root_connection().await;
 

e2e-tests/src/test/version_upgrade.rs

@@ -6,7 +6,7 @@ use aleph_client::{
 };
 use primitives::SessionIndex;
 
-use crate::config::config;
+use crate::config::setup_test;
 
 const UPGRADE_TO_VERSION: u32 = 1;
 
@@ -17,7 +17,7 @@ const UPGRADE_FINALIZATION_WAIT_SESSIONS: u32 = 3;
 // Simple test that schedules a version upgrade, awaits it, and checks if node is still finalizing after planned upgrade session.
 #[tokio::test]
 pub async fn schedule_version_change() -> anyhow::Result<()> {
-    let config = config();
+    let config = setup_test();
     let connection = config.create_root_connection().await;
     let test_case_params = config.test_case_params.clone();
 
@@ -58,7 +58,7 @@ pub async fn schedule_version_change() -> anyhow::Result<()> {
 #[tokio::test]
 pub async fn schedule_doomed_version_change_and_verify_finalization_stopped() -> anyhow::Result<()>
 {
-    let config = config();
+    let config = setup_test();
     let connection = config.create_root_connection().await;
     let test_case_params = config.test_case_params.clone();