From 695efa3d36a1185242fa5cf42ddf1ce386fdf9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Tue, 22 Nov 2022 14:34:33 +0100 Subject: [PATCH 01/13] Use the default rust test runner --- e2e-tests/.idea/e2e-tests.iml | 11 ++ .../inspectionProfiles/Project_Default.xml | 6 ++ e2e-tests/.idea/modules.xml | 8 ++ e2e-tests/.idea/workspace.xml | 102 ++++++++++++++++++ e2e-tests/Cargo.lock | 31 +++++- e2e-tests/Cargo.toml | 1 + e2e-tests/src/ban.rs | 4 +- e2e-tests/src/cases.rs | 90 ---------------- e2e-tests/src/config.rs | 13 +++ e2e-tests/src/lib.rs | 12 ++- e2e-tests/src/main.rs | 52 --------- e2e-tests/src/rewards.rs | 6 +- e2e-tests/src/test/ban.rs | 18 +++- e2e-tests/src/test/electing_validators.rs | 7 +- e2e-tests/src/test/era_payout.rs | 6 +- e2e-tests/src/test/era_validators.rs | 6 +- e2e-tests/src/test/fee.rs | 6 +- e2e-tests/src/test/finalization.rs | 7 +- e2e-tests/src/test/mod.rs | 1 - e2e-tests/src/test/rewards.rs | 22 ++-- e2e-tests/src/test/staking.rs | 10 +- e2e-tests/src/test/transfer.rs | 6 +- e2e-tests/src/test/treasury.rs | 10 +- e2e-tests/src/test/utility.rs | 6 +- e2e-tests/src/test/validators_change.rs | 7 +- e2e-tests/src/test/validators_rotate.rs | 8 +- e2e-tests/src/test/version_upgrade.rs | 13 ++- e2e-tests/src/validators.rs | 2 +- scripts/run_e2e.sh | 2 +- 29 files changed, 277 insertions(+), 196 deletions(-) create mode 100644 e2e-tests/.idea/e2e-tests.iml create mode 100644 e2e-tests/.idea/inspectionProfiles/Project_Default.xml create mode 100644 e2e-tests/.idea/modules.xml create mode 100644 e2e-tests/.idea/workspace.xml delete mode 100644 e2e-tests/src/cases.rs delete mode 100644 e2e-tests/src/main.rs diff --git a/e2e-tests/.idea/e2e-tests.iml b/e2e-tests/.idea/e2e-tests.iml new file mode 100644 index 0000000000..c254557e13 --- /dev/null +++ b/e2e-tests/.idea/e2e-tests.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/e2e-tests/.idea/inspectionProfiles/Project_Default.xml b/e2e-tests/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000000..ada9063674 --- /dev/null +++ b/e2e-tests/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/e2e-tests/.idea/modules.xml b/e2e-tests/.idea/modules.xml new file mode 100644 index 0000000000..dad321d667 --- /dev/null +++ b/e2e-tests/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/e2e-tests/.idea/workspace.xml b/e2e-tests/.idea/workspace.xml new file mode 100644 index 0000000000..21a72f054c --- /dev/null +++ b/e2e-tests/.idea/workspace.xml @@ -0,0 +1,102 @@ + + + { + "useNewFormat": true +} + + + + + + + + + + + + + + + + + + + + + + + + { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.cidr.known.project.marker": "true", + "WebServerToolWindowFactoryState": "false", + "cf.first.check.clang-format": "false", + "cidr.known.project.marker": "true", + "last_opened_file_path": "/home/yapee/Projects/aleph-node/aleph-client", + "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true", + "settings.editor.selected.configurable": "com.maddyhome.idea.vim.ui.VimEmulationConfigurable" + } +} + + + + + + + + + + + + + + 1664886613593 + + + + + + + + - - \ No newline at end of file From 4660b2a82535301eeee4de382ff4cfe1ef4f0022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Thu, 24 Nov 2022 14:10:13 +0100 Subject: [PATCH 05/13] Fix mismerge --- e2e-tests/Cargo.lock | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/e2e-tests/Cargo.lock b/e2e-tests/Cargo.lock index 7efac9ddcb..2f908ba910 100644 --- a/e2e-tests/Cargo.lock +++ b/e2e-tests/Cargo.lock @@ -2148,21 +2148,6 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.29)", ] -[[package]] -name = "pallet-contracts-primitives" -version = "6.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.28#5e8b6fa2130236497878e53c169e41f1f7871e6b" -dependencies = [ - "bitflags", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.28)", - "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.28)", - "sp-std 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.28)", -] - [[package]] name = "pallet-elections" version = "0.5.1" @@ -3562,8 +3547,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "regist -Also send to dev-corery+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb7d8a8d5ab5d349c6cf9300af1721b7b6446ba63401dbb11c10a1d65197aa5f" dependencies = [ "either", From d947180fa1e93425963531d3349c394dc498107f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Thu, 24 Nov 2022 15:21:45 +0100 Subject: [PATCH 06/13] Refer explicitly to some more testcases --- .github/workflows/e2e-tests-main-devnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests-main-devnet.yml b/.github/workflows/e2e-tests-main-devnet.yml index 8d10ffea85..c754f16d36 100644 --- a/.github/workflows/e2e-tests-main-devnet.yml +++ b/.github/workflows/e2e-tests-main-devnet.yml @@ -515,7 +515,7 @@ jobs: - name: Run e2e test uses: ./.github/actions/run-e2e-test with: - test-case: version_upgrade + test-case: version_upgrade::schedule_version_change env: UPGRADE_VERSION: 1 UPGRADE_SESSION: 3 @@ -533,7 +533,7 @@ jobs: - name: Run e2e test uses: ./.github/actions/run-e2e-test with: - test-case: doomed_version_upgrade + test-case: version_upgrade::schedule_doomed_version_change env: OVERRIDE_DOCKER_COMPOSE: ./.github/scripts/docker-compose.no_quorum_without_old.override.yml UPGRADE_VERSION: 1 From 508cae2c6f2ec59851e1269ad5c8d228aae781ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Thu, 24 Nov 2022 16:02:58 +0100 Subject: [PATCH 07/13] Refer explicitly to some more testcases --- .github/workflows/e2e-tests-main-devnet.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-tests-main-devnet.yml b/.github/workflows/e2e-tests-main-devnet.yml index c754f16d36..3e304c555a 100644 --- a/.github/workflows/e2e-tests-main-devnet.yml +++ b/.github/workflows/e2e-tests-main-devnet.yml @@ -194,7 +194,7 @@ jobs: - name: Run e2e test uses: ./.github/actions/run-e2e-test with: - test-case: rewards_disable_node + test-case: rewards::disable_node follow-up-finalization-check: true timeout-minutes: 15 @@ -347,7 +347,7 @@ jobs: - name: Run e2e test uses: ./.github/actions/run-e2e-test with: - test-case: era_payout + test-case: era_payout::era_payout follow-up-finalization-check: true timeout-minutes: 10 @@ -377,7 +377,7 @@ jobs: - name: Run e2e test uses: ./.github/actions/run-e2e-test with: - test-case: rewards_force_new_era + test-case: rewards::force_new_era follow-up-finalization-check: true timeout-minutes: 10 @@ -392,7 +392,7 @@ jobs: - name: Run e2e test uses: ./.github/actions/run-e2e-test with: - test-case: rewards_stake_change + test-case: rewards::points_stake_change follow-up-finalization-check: true timeout-minutes: 10 @@ -407,7 +407,7 @@ jobs: - name: Run e2e test uses: ./.github/actions/run-e2e-test with: - test-case: rewards_change_stake_and_force_new_era + test-case: rewards::change_stake_and_force_new_era follow-up-finalization-check: true timeout-minutes: 10 From a5f8a0dd6a029a58197e3fe837ff8a89008c9ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Thu, 24 Nov 2022 17:40:23 +0100 Subject: [PATCH 08/13] Initialize logging in e2e tests --- e2e-tests/src/config.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e-tests/src/config.rs b/e2e-tests/src/config.rs index b071ba8ba0..589bc93fd6 100644 --- a/e2e-tests/src/config.rs +++ b/e2e-tests/src/config.rs @@ -14,6 +14,7 @@ static GLOBAL_CONFIG: Lazy = Lazy::new(|| { }); pub fn config() -> &'static Config { + let _ = env_logger::builder().is_test(true).try_init(); &GLOBAL_CONFIG } From 13b5a659a8e418b97d4e532b7a4a2f95f942310a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Fri, 25 Nov 2022 14:01:06 +0100 Subject: [PATCH 09/13] Ignore ban_automatic test for now See https://cardinal-cryptography.atlassian.net/browse/A0-1634 --- e2e-tests/src/test/ban.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e-tests/src/test/ban.rs b/e2e-tests/src/test/ban.rs index 87d507d275..8e34b8f84e 100644 --- a/e2e-tests/src/test/ban.rs +++ b/e2e-tests/src/test/ban.rs @@ -55,6 +55,7 @@ async fn disable_validator(validator_address: &str, validator_seed: u32) -> anyh /// producing blocks. Verifies that the offending validator has in fact been banned out for the /// appropriate reason. #[tokio::test] +#[ignore] pub async fn ban_automatic() -> anyhow::Result<()> { let config = config(); let (root_connection, reserved_validators, non_reserved_validators, _) = From 4d8a3c6bba6816b2ef3dc154db10a079f6a3bc97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Thu, 1 Dec 2022 14:49:08 +0100 Subject: [PATCH 10/13] Rename config() -> setup_test() --- e2e-tests/src/config.rs | 2 +- e2e-tests/src/test/ban.rs | 10 +++++----- e2e-tests/src/test/electing_validators.rs | 4 ++-- e2e-tests/src/test/era_payout.rs | 4 ++-- e2e-tests/src/test/era_validators.rs | 4 ++-- e2e-tests/src/test/fee.rs | 4 ++-- e2e-tests/src/test/finalization.rs | 4 ++-- e2e-tests/src/test/rewards.rs | 12 ++++++------ e2e-tests/src/test/staking.rs | 6 +++--- e2e-tests/src/test/transfer.rs | 4 ++-- e2e-tests/src/test/treasury.rs | 6 +++--- e2e-tests/src/test/utility.rs | 4 ++-- e2e-tests/src/test/validators_change.rs | 4 ++-- e2e-tests/src/test/validators_rotate.rs | 4 ++-- e2e-tests/src/test/version_upgrade.rs | 6 +++--- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/e2e-tests/src/config.rs b/e2e-tests/src/config.rs index 589bc93fd6..f3364a218c 100644 --- a/e2e-tests/src/config.rs +++ b/e2e-tests/src/config.rs @@ -13,7 +13,7 @@ static GLOBAL_CONFIG: Lazy = 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 } diff --git a/e2e-tests/src/test/ban.rs b/e2e-tests/src/test/ban.rs index 4931681f94..c7b8869ff1 100644 --- a/e2e-tests/src/test/ban.rs +++ b/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?; diff --git a/e2e-tests/src/test/electing_validators.rs b/e2e-tests/src/test/electing_validators.rs index 4d7b5d62bb..31994843b3 100644 --- a/e2e-tests/src/test/electing_validators.rs +++ b/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) { /// 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; diff --git a/e2e-tests/src/test/era_payout.rs b/e2e-tests/src/test/era_payout.rs index d00f52e829..d2576d1584 100644 --- a/e2e-tests/src/test/era_payout.rs +++ b/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?; diff --git a/e2e-tests/src/test/era_validators.rs b/e2e-tests/src/test/era_validators.rs index 21c86a0ac8..81c2570116 100644 --- a/e2e-tests/src/test/era_validators.rs +++ b/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 { @@ -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; diff --git a/e2e-tests/src/test/fee.rs b/e2e-tests/src/test/fee.rs index f096168d01..3fcf1a4132 100644 --- a/e2e-tests/src/test/fee.rs +++ b/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; diff --git a/e2e-tests/src/test/finalization.rs b/e2e-tests/src/test/finalization.rs index 60e1240025..2c28b5d32f 100644 --- a/e2e-tests/src/test/finalization.rs +++ b/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; diff --git a/e2e-tests/src/test/rewards.rs b/e2e-tests/src/test/rewards.rs index e814f14d84..9ca7ff4e16 100644 --- a/e2e-tests/src/test/rewards.rs +++ b/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; diff --git a/e2e-tests/src/test/staking.rs b/e2e-tests/src/test/staking.rs index 725288fd50..82d4957191 100644 --- a/e2e-tests/src/test/staking.rs +++ b/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, Vec) { @@ -43,7 +43,7 @@ fn get_validator_stashes_key_pairs(config: &Config) -> (Vec, Vec 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()); diff --git a/e2e-tests/src/test/transfer.rs b/e2e-tests/src/test/transfer.rs index 5bc69c5d26..8cd33daa3c 100644 --- a/e2e-tests/src/test/transfer.rs +++ b/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 diff --git a/e2e-tests/src/test/treasury.rs b/e2e-tests/src/test/treasury.rs index aab80ddcc1..50df832815 100644 --- a/e2e-tests/src/test/treasury.rs +++ b/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; diff --git a/e2e-tests/src/test/utility.rs b/e2e-tests/src/test/utility.rs index b6d783d38b..c675dc32c3 100644 --- a/e2e-tests/src/test/utility.rs +++ b/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; diff --git a/e2e-tests/src/test/validators_change.rs b/e2e-tests/src/test/validators_change.rs index 01fe498fdd..e1e0e8cb4a 100644 --- a/e2e-tests/src/test/validators_change.rs +++ b/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; diff --git a/e2e-tests/src/test/validators_rotate.rs b/e2e-tests/src/test/validators_rotate.rs index 090a4976cf..56d222346c 100644 --- a/e2e-tests/src/test/validators_rotate.rs +++ b/e2e-tests/src/test/validators_rotate.rs @@ -9,7 +9,7 @@ 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, }; @@ -17,7 +17,7 @@ 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; diff --git a/e2e-tests/src/test/version_upgrade.rs b/e2e-tests/src/test/version_upgrade.rs index eb4589eab0..8f718335b3 100644 --- a/e2e-tests/src/test/version_upgrade.rs +++ b/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(); From d0c89f672efdc972220290a47ccf3d80312ce2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Thu, 1 Dec 2022 15:12:08 +0100 Subject: [PATCH 11/13] Take e2e test binary location from cargo --- .github/workflows/e2e-tests-main-devnet.yml | 3 +-- e2e-tests/Cargo.lock | 1 + scripts/run_e2e.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-tests-main-devnet.yml b/.github/workflows/e2e-tests-main-devnet.yml index 73a9ee3168..b172da2cb1 100644 --- a/.github/workflows/e2e-tests-main-devnet.yml +++ b/.github/workflows/e2e-tests-main-devnet.yml @@ -166,8 +166,7 @@ jobs: run: | cd e2e-tests/ rm -f target/release/deps/aleph_e2e_client* - cargo test --no-run --release - cp $(find target/release/deps/ -executable | grep aleph_e2e_client | head) target/release/aleph-e2e-client + cp $(cargo test --no-run --release --message-format=json | jq -r .executable | grep aleph_e2e_client) target/release/aleph_e2e_client docker build --tag aleph-e2e-client:latest -f Dockerfile . docker save -o aleph-e2e-client.tar aleph-e2e-client:latest diff --git a/e2e-tests/Cargo.lock b/e2e-tests/Cargo.lock index a57f4551b1..8d3e01291e 100644 --- a/e2e-tests/Cargo.lock +++ b/e2e-tests/Cargo.lock @@ -2268,6 +2268,7 @@ name = "pallets-support" version = "0.1.2" dependencies = [ "frame-support", + "sp-std 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.30)", ] [[package]] diff --git a/scripts/run_e2e.sh b/scripts/run_e2e.sh index 6491051286..d7d0266cc0 100755 --- a/scripts/run_e2e.sh +++ b/scripts/run_e2e.sh @@ -4,6 +4,6 @@ set -e cd e2e-tests/ -E2E_CONFIG="--node 127.0.0.1:9943" RUST_LOG=aleph_e2e_client=info,aleph-client=info cargo test -- --nocapture +E2E_CONFIG="--node ws://127.0.0.1:9943" RUST_LOG=info cargo test -- --nocapture exit $? From 82f1677c493b662d03c921d1743ec2ff30f01332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Thu, 1 Dec 2022 15:13:19 +0100 Subject: [PATCH 12/13] Update e2e docker build in nightly --- .github/workflows/nightly-pipeline.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly-pipeline.yaml b/.github/workflows/nightly-pipeline.yaml index 8d8bec3367..6f9394263a 100644 --- a/.github/workflows/nightly-pipeline.yaml +++ b/.github/workflows/nightly-pipeline.yaml @@ -108,7 +108,8 @@ jobs: - name: Build binary and docker image run: | cd e2e-tests/ - cargo build --release + rm -f target/release/deps/aleph_e2e_client* + cp $(cargo test --no-run --release --message-format=json | jq -r .executable | grep aleph_e2e_client) target/release/aleph_e2e_client docker build --tag aleph-e2e-client:latest -f Dockerfile . docker save -o aleph-e2e-client.tar aleph-e2e-client:latest From e2f38f71efd516d8cc35e1d42d535dffb6bcad2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Obrok?= Date: Thu, 1 Dec 2022 15:35:19 +0100 Subject: [PATCH 13/13] Fix typo --- .github/workflows/e2e-tests-main-devnet.yml | 2 +- .github/workflows/nightly-pipeline.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests-main-devnet.yml b/.github/workflows/e2e-tests-main-devnet.yml index ad07b26dee..fd9047eb87 100644 --- a/.github/workflows/e2e-tests-main-devnet.yml +++ b/.github/workflows/e2e-tests-main-devnet.yml @@ -166,7 +166,7 @@ jobs: run: | cd e2e-tests/ rm -f target/release/deps/aleph_e2e_client* - cp $(cargo test --no-run --release --message-format=json | jq -r .executable | grep aleph_e2e_client) target/release/aleph_e2e_client + cp $(cargo test --no-run --release --message-format=json | jq -r .executable | grep aleph_e2e_client) target/release/aleph-e2e-client docker build --tag aleph-e2e-client:latest -f Dockerfile . docker save -o aleph-e2e-client.tar aleph-e2e-client:latest diff --git a/.github/workflows/nightly-pipeline.yaml b/.github/workflows/nightly-pipeline.yaml index 6f9394263a..25ee16ca50 100644 --- a/.github/workflows/nightly-pipeline.yaml +++ b/.github/workflows/nightly-pipeline.yaml @@ -109,7 +109,7 @@ jobs: run: | cd e2e-tests/ rm -f target/release/deps/aleph_e2e_client* - cp $(cargo test --no-run --release --message-format=json | jq -r .executable | grep aleph_e2e_client) target/release/aleph_e2e_client + cp $(cargo test --no-run --release --message-format=json | jq -r .executable | grep aleph_e2e_client) target/release/aleph-e2e-client docker build --tag aleph-e2e-client:latest -f Dockerfile . docker save -o aleph-e2e-client.tar aleph-e2e-client:latest