Merge branch 'main' into upgrade_0926 and replace use of depricated t…

…raits and functions with suggested ones.

runtime/battery-station/src/lib.rs

@@ -39,7 +39,7 @@ pub use crate::parachain_params::*;
 pub use crate::parameters::*;
 use alloc::vec;
 use frame_support::{
-    traits::{ConstU16, ConstU32, Contains, EnsureOneOf, EqualPrivilegeOnly, InstanceFilter},
+    traits::{ConstU16, ConstU32, Contains, EitherOfDiverse, EqualPrivilegeOnly, InstanceFilter},
     weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee},
 };
 use frame_system::EnsureRoot;

runtime/common/src/lib.rs

@@ -98,56 +98,56 @@ macro_rules! decl_common_types {
         // Council vote proportions
         // At least 50%
         type EnsureRootOrHalfCouncil =
-            EnsureOneOf<EnsureRoot<AccountId>, EnsureProportionAtLeast<AccountId, CouncilInstance, 1, 2>>;
+            EitherOfDiverse<EnsureRoot<AccountId>, EnsureProportionAtLeast<AccountId, CouncilInstance, 1, 2>>;
 
         // At least 66%
         type EnsureRootOrTwoThirdsCouncil =
-            EnsureOneOf<EnsureRoot<AccountId>, EnsureProportionAtLeast<AccountId, CouncilInstance, 2, 3>>;
+            EitherOfDiverse<EnsureRoot<AccountId>, EnsureProportionAtLeast<AccountId, CouncilInstance, 2, 3>>;
 
         // At least 75%
         type EnsureRootOrThreeFourthsCouncil =
-            EnsureOneOf<EnsureRoot<AccountId>, EnsureProportionAtLeast<AccountId, CouncilInstance, 3, 4>>;
+            EitherOfDiverse<EnsureRoot<AccountId>, EnsureProportionAtLeast<AccountId, CouncilInstance, 3, 4>>;
 
         // At least 100%
         type EnsureRootOrAllCouncil =
-            EnsureOneOf<EnsureRoot<AccountId>, EnsureProportionAtLeast<AccountId, CouncilInstance, 1, 1>>;
+            EitherOfDiverse<EnsureRoot<AccountId>, EnsureProportionAtLeast<AccountId, CouncilInstance, 1, 1>>;
 
         // Technical committee vote proportions
         // At least 50%
         #[cfg(feature = "parachain")]
-        type EnsureRootOrHalfTechnicalCommittee = EnsureOneOf<
+        type EnsureRootOrHalfTechnicalCommittee = EitherOfDiverse<
             EnsureRoot<AccountId>,
             EnsureProportionAtLeast<AccountId, TechnicalCommitteeInstance, 1, 2>,
         >;
 
         // At least 66%
-        type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf<
+        type EnsureRootOrTwoThirdsTechnicalCommittee = EitherOfDiverse<
             EnsureRoot<AccountId>,
             EnsureProportionAtLeast<AccountId, TechnicalCommitteeInstance, 2, 3>,
         >;
 
         // At least 100%
-        type EnsureRootOrAllTechnicalCommittee = EnsureOneOf<
+        type EnsureRootOrAllTechnicalCommittee = EitherOfDiverse<
             EnsureRoot<AccountId>,
             EnsureProportionAtLeast<AccountId, TechnicalCommitteeInstance, 1, 1>,
         >;
 
         // Advisory committee vote proportions
         // At least 50%
-        type EnsureRootOrHalfAdvisoryCommittee = EnsureOneOf<
+        type EnsureRootOrHalfAdvisoryCommittee = EitherOfDiverse<
             EnsureRoot<AccountId>,
             EnsureProportionAtLeast<AccountId, AdvisoryCommitteeInstance, 1, 2>,
         >;
 
         // Technical committee vote proportions
         // At least 66%
-        type EnsureRootOrTwoThirdsAdvisoryCommittee = EnsureOneOf<
+        type EnsureRootOrTwoThirdsAdvisoryCommittee = EitherOfDiverse<
             EnsureRoot<AccountId>,
             EnsureProportionAtLeast<AccountId, AdvisoryCommitteeInstance, 2, 3>,
         >;
 
         // At least 100%
-        type EnsureRootOrAllAdvisoryCommittee = EnsureOneOf<
+        type EnsureRootOrAllAdvisoryCommittee = EitherOfDiverse<
             EnsureRoot<AccountId>,
             EnsureProportionAtLeast<AccountId, AdvisoryCommitteeInstance, 1, 1>,
         >;
@@ -923,7 +923,7 @@ macro_rules! impl_config_traits {
         impl zrml_prediction_markets::Config for Runtime {
             type AdvisoryBond = AdvisoryBond;
             type AdvisoryBondSlashPercentage = AdvisoryBondSlashPercentage;
-            type ApproveOrigin = EnsureOneOf<
+            type ApproveOrigin = EitherOfDiverse<
                 EnsureRoot<AccountId>,
                 pallet_collective::EnsureMember<AccountId, AdvisoryCommitteeInstance>
             >;

runtime/zeitgeist/src/lib.rs

@@ -39,7 +39,7 @@ pub use crate::parachain_params::*;
 pub use crate::parameters::*;
 use alloc::vec;
 use frame_support::{
-    traits::{ConstU16, ConstU32, Contains, EnsureOneOf, EqualPrivilegeOnly, InstanceFilter},
+    traits::{ConstU16, ConstU32, Contains, EitherOfDiverse, EqualPrivilegeOnly, InstanceFilter},
     weights::{constants::RocksDbWeight, ConstantMultiplier, IdentityFee},
 };
 use frame_system::EnsureRoot;

zrml/court/src/lib.rs

@@ -542,8 +542,8 @@ mod pallet {
                 Self::manage_tardy_jurors(&requested_jurors, |_| false)?
             };
             Self::slash_losers_to_award_winners(&valid_winners_and_losers, &first)?;
-            Votes::<T>::remove_prefix(market_id, None);
-            RequestedJurors::<T>::remove_prefix(market_id, None);
+            let _ = Votes::<T>::clear_prefix(market_id, u32::max_value(), None);
+            let _ = RequestedJurors::<T>::clear_prefix(market_id, u32::max_value(), None);
             Ok(Some(first))
         }
     }

zrml/liquidity-mining/src/track_incentives_based_on_bought_shares.rs

@@ -69,7 +69,7 @@ where
             }
         }
 
-        <BlockBoughtShares<T>>::remove_all(None);
+        let _ = <BlockBoughtShares<T>>::clear(u32::max_value(), None);
         Some(market_incentives_len)
     }
 

zrml/liquidity-mining/src/track_incentives_based_on_sold_shares.rs

@@ -57,7 +57,7 @@ where
             });
             counter = counter.saturating_add(1);
         }
-        <BlockSoldShares<T>>::remove_all(None);
+        let _ = <BlockSoldShares<T>>::clear(u32::max_value(), None);
         counter
     }
 }