revert changes in runtime

Cardinal-Cryptography · kostekIV · Dec 8, 2022 · Nov 2, 2022 · Nov 2, 2022 · Nov 2, 2022
commit c891593397f3641f5cbab261903d8b189700d3bb
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/runtime/Cargo.toml b/bin/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aleph-runtime"
-version = "0.8.1"
+version = "0.8.0"
 authors = ["Cardinal Cryptography"]
 edition = "2021"
 homepage = "https://alephzero.org"

diff --git a/bin/runtime/src/lib.rs b/bin/runtime/src/lib.rs
@@ -108,7 +108,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("aleph-node"),
     impl_name: create_runtime_str!("aleph-node"),
     authoring_version: 1,
-    spec_version: 39,
+    spec_version: 38,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 13,

diff --git a/e2e-tests/Cargo.lock b/e2e-tests/Cargo.lock
diff --git a/e2e-tests/src/test/ban.rs b/e2e-tests/src/test/ban.rs
@@ -291,12 +291,6 @@ pub async fn permissionless_ban(config: &Config) -> anyhow::Result<()> {
 
     let ban_period = 2;
     let test_non_reserved_validators = vec![];
-    root_connection
-        .set_election_openness(ElectionOpenness::Permissionless, TxStatus::InBlock)
-        .await?;
-    root_connection
-        .set_ban_config(None, None, None, Some(ban_period), TxStatus::InBlock)
-        .await?;
     root_connection
         .change_validators(
             Some(reserved_validators),
@@ -305,6 +299,12 @@ pub async fn permissionless_ban(config: &Config) -> anyhow::Result<()> {
             TxStatus::InBlock,
         )
         .await?;
+    root_connection
+        .set_election_openness(ElectionOpenness::Permissionless, TxStatus::InBlock)
+        .await?;
+    root_connection
+        .set_ban_config(None, None, None, Some(ban_period), TxStatus::InBlock)
+        .await?;
     root_connection
         .ban_from_committee(validator_to_ban.clone(), vec![], TxStatus::InBlock)
         .await?;

diff --git a/pallets/elections/Cargo.toml b/pallets/elections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-elections"
-version = "0.5.1"
+version = "0.5.0"
 edition = "2021"
 license = "Apache 2.0"
 

diff --git a/pallets/elections/src/lib.rs b/pallets/elections/src/lib.rs
@@ -399,10 +399,8 @@ pub mod pallet {
 
             let committee_size_all = reserved + non_reserved;
 
-            let mode = Openness::<T>::get();
-
             ensure!(
-                committee_size_all <= validators_size || mode == ElectionOpenness::Permissionless,
+                committee_size_all <= validators_size,
                 Error::<T>::NotEnoughValidators
             );
 
@@ -412,8 +410,8 @@ pub mod pallet {
             );
 
             ensure!(
-                non_reserved <= non_reserved_len || mode == ElectionOpenness::Permissionless,
-                Error::<T>::NotEnoughNonReservedValidators,
+                non_reserved <= non_reserved_len,
+                Error::<T>::NotEnoughReservedValidators,
             );
 
             let member_set: BTreeSet<_> = reserved_validators