Merge remote-tracking branch 'origin/main' into network_tests.synthet…

…ic-network.pipelines

.github/actions/run-e2e-test/action.yml

@@ -26,6 +26,10 @@ inputs:
   follow-up-finalization-check:
     description: 'Whether to run a follow-up finalization check.'
     required: false
+  deploy-adder:
+    description: 'Whether to deploy the adder sample contract to the node.'
+    required: false
+    default: 'false'
   image-path:
     description: 'Custom path to docker image for aleph-node'
     required: false

Cargo.toml

@@ -18,6 +18,7 @@ exclude = [
   "fork-off",
   "benches/payout-stakers",
   "bin/cliain",
+  "contracts/adder"
   "scripts/synthetic-network/synthetic-link",
 ]
 

aleph-client/src/waiting.rs

@@ -43,14 +43,14 @@ impl<C: AsRef<Connection> + Sync> AlephWaiting for C {
                 .blocks()
                 .subscribe_best()
                 .await
-                .unwrap(),
+                .expect("Failed to subscribe to the best block stream!"),
             BlockStatus::Finalized => self
                 .as_ref()
                 .client
                 .blocks()
                 .subscribe_finalized()
                 .await
-                .unwrap(),
+                .expect("Failed to subscribe to the finalized block stream!"),
         };
 
         while let Some(Ok(block)) = block_sub.next().await {
@@ -72,14 +72,14 @@ impl<C: AsRef<Connection> + Sync> AlephWaiting for C {
                 .blocks()
                 .subscribe_best()
                 .await
-                .unwrap(),
+                .expect("Failed to subscribe to the best block stream!"),
             BlockStatus::Finalized => self
                 .as_ref()
                 .client
                 .blocks()
                 .subscribe_finalized()
                 .await
-                .unwrap(),
+                .expect("Failed to subscribe to the finalized block stream!"),
         };
 
         info!(target: "aleph-client", "waiting for event {}.{}", T::PALLET, T::EVENT);
@@ -105,7 +105,12 @@ impl<C: AsRef<Connection> + Sync> AlephWaiting for C {
 
     async fn wait_for_era(&self, era: EraIndex, status: BlockStatus) {
         let addrs = aleph_zero::api::constants().staking().sessions_per_era();
-        let sessions_per_era = self.as_ref().client.constants().at(&addrs).unwrap();
+        let sessions_per_era = self
+            .as_ref()
+            .client
+            .constants()
+            .at(&addrs)
+            .expect("Failed to obtain sessions_per_era const!");
         let first_session_in_era = era * sessions_per_era;
 
         self.wait_for_session(first_session_in_era, status).await;

e2e-tests/src/config.rs

@@ -13,25 +13,20 @@ static GLOBAL_CONFIG: Lazy<Config> = Lazy::new(|| {
         .ok()
         .map(|s| s.split(',').map(|s| s.to_string()).collect());
     let sudo_seed = get_env("SUDO_SEED").unwrap_or_else(|| "//Alice".to_string());
-    let reserved_seats = get_env("RESERVED_SEATS");
-    let non_reserved_seats = get_env("NON_RESERVED_SEATS");
-    let upgrade_to_version = get_env("UPGRADE_VERSION");
-    let upgrade_session = get_env("UPGRADE_SESSION");
-    let upgrade_finalization_wait_sessions = get_env("UPGRADE_FINALIZATION_WAIT_SESSIONS");
-    let out_latency = get_env("OUT_LATENCY").unwrap_or(500);
 
     Config {
         node,
         validator_count,
         validators_seeds,
         sudo_seed,
         test_case_params: TestCaseParams {
-            reserved_seats,
-            non_reserved_seats,
-            upgrade_to_version,
-            upgrade_session,
-            upgrade_finalization_wait_sessions,
-            out_latency,
+            reserved_seats: get_env("RESERVED_SEATS"),
+            non_reserved_seats: get_env("NON_RESERVED_SEATS"),
+            upgrade_to_version: get_env("UPGRADE_VERSION"),
+            upgrade_session: get_env("UPGRADE_SESSION"),
+            upgrade_finalization_wait_sessions: get_env("UPGRADE_FINALIZATION_WAIT_SESSIONS"),
+            adder: get_env("ADDER"),
+            adder_metadata: get_env("ADDER_METADATA"),
         },
     }
 });
@@ -132,6 +127,12 @@ pub struct TestCaseParams {
     /// How many sessions we should wait after upgrade in VersionUpgrade test.
     pub upgrade_finalization_wait_sessions: Option<u32>,
 
+    /// Adder contract address.
+    pub adder: Option<String>,
+
+    /// Adder contract metadata.
+    pub adder_metadata: Option<String>,
+
     /// Milliseconds of network latency
     pub out_latency: u64,
 }

e2e-tests/src/test/mod.rs

@@ -26,6 +26,7 @@ mod era_payout;
 mod era_validators;
 mod fee;
 mod finalization;
+mod helpers;
 mod high_latency;
 mod rewards;
 mod staking;

rust-toolchain

@@ -1 +1 @@
-nightly-2022-11-28
+nightly-2022-08-12