Merge branch 'benjamin' into obrok/dex-e2e

e2e-tests/src/cases.rs

@@ -14,7 +14,9 @@ use crate::{
         fee_calculation as test_fee_calculation, finalization as test_finalization,
         force_new_era as test_force_new_era, marketplace as test_marketplace,
         points_basic as test_points_basic, points_stake_change as test_points_stake_change,
-        simple_dex as test_simple_dex, staking_era_payouts as test_staking_era_payouts,
+        schedule_doomed_version_change_and_verify_finalization_stopped as test_schedule_doomed_version_change_and_verify_finalization_stopped,
+        schedule_version_change as test_schedule_version_change, simple_dex as test_simple_dex,
+        staking_era_payouts as test_staking_era_payouts,
         staking_new_validator as test_staking_new_validator,
         the_pressiah_cometh as test_the_pressiah_cometh, token_transfer as test_token_transfer,
         treasury_access as test_treasury_access, validators_rotate as test_validators_rotate,
@@ -71,5 +73,11 @@ pub fn possible_test_cases() -> PossibleTestCases {
         ("the_pressiah_cometh", test_the_pressiah_cometh as TestCase),
         ("marketplace", test_marketplace as TestCase),
         ("simple_dex", test_simple_dex as TestCase),
+        ("ban_automatic", test_ban_automatic as TestCase),
+        ("ban_manual", test_ban_manual as TestCase),
+        (
+            "clearing_session_count",
+            test_clearing_session_count as TestCase,
+        ),
     ]
 }

e2e-tests/src/config.rs

@@ -104,4 +104,16 @@ pub struct TestCaseParams {
     /// Path to the simple_dex metadata file. Only used by button tests.
     #[clap(long)]
     pub simple_dex_metadata: Option<String>,
+
+    /// Version for the VersionUpgrade test.
+    #[clap(long)]
+    pub upgrade_to_version: Option<u32>,
+
+    /// Session in which we should schedule an upgrade in VersionUpgrade test.
+    #[clap(long)]
+    pub upgrade_session: Option<SessionIndex>,
+
+    /// How many sessions we should wait after upgrade in VersionUpgrade test.
+    #[clap(long)]
+    pub upgrade_finalization_wait_sessions: Option<u32>,
 }