chore: upgrade to polkadot 0.9.40

crates/annuity/src/benchmarking.rs

@@ -47,6 +47,8 @@ pub mod benchmarks {
 
         // only one account with stake so they get all of the rewards
         assert_eq!(T::Currency::free_balance(&caller), rewards_before + balance);
+
+        Ok(())
     }
 
     #[benchmark]

crates/btc-relay/rpc/src/lib.rs

@@ -61,9 +61,9 @@ where
         at: Option<<Block as BlockT>::Hash>,
     ) -> RpcResult<Result<(), DispatchError>> {
         let api = self.client.runtime_api();
-        let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
 
-        api.verify_block_header_inclusion(&at, block_hash)
+        api.verify_block_header_inclusion(at, block_hash)
             .map_err(|e| internal_err(format!("execution error: Unable to dry run extrinsic {:?}", e)))
     }
 }

crates/btc-relay/src/lib.rs

@@ -83,7 +83,6 @@ pub mod pallet {
     use frame_system::pallet_prelude::*;
 
     #[pallet::pallet]
-    #[pallet::generate_store(trait Store)]
     pub struct Pallet<T>(_);
 
     #[pallet::config]

crates/clients-info/src/lib.rs

@@ -41,7 +41,6 @@ pub mod pallet {
     use frame_system::pallet_prelude::*;
 
     #[pallet::pallet]
-    #[pallet::generate_store(trait Store)]
     pub struct Pallet<T>(_);
 
     #[pallet::config]

crates/collator-selection/src/lib.rs

@@ -147,7 +147,6 @@ pub mod pallet {
     }
 
     #[pallet::pallet]
-    #[pallet::generate_store(pub(super) trait Store)]
     pub struct Pallet<T>(_);
 
     /// The invulnerable, fixed collators.

crates/democracy/src/benchmarking.rs

@@ -84,6 +84,8 @@ pub mod benchmarks {
             p as usize,
             "Proposals not created."
         );
+
+        Ok(())
     }
 
     #[benchmark]
@@ -117,7 +119,7 @@ pub mod benchmarks {
     }
 
     #[benchmark]
-    pub fn vote_new() {
+    pub fn vote_new() -> Result<(), BenchmarkError> {
         let caller = funded_account::<T>("caller", 0);
         let account_vote = account_vote::<T>(100u32.into());
 
@@ -141,10 +143,12 @@ pub mod benchmarks {
 
         let Voting { votes, .. } = VotingOf::<T>::get(&caller);
         assert_eq!(votes.len(), T::MaxVotes::get() as usize, "Vote was not recorded.");
+
+        Ok(())
     }
 
     #[benchmark]
-    pub fn vote_existing() {
+    pub fn vote_existing() -> Result<(), BenchmarkError> {
         let caller = funded_account::<T>("caller", 0);
         let account_vote = account_vote::<T>(100u32.into());
 
@@ -177,6 +181,8 @@ pub mod benchmarks {
             _ => panic!("referendum not ongoing"),
         };
         assert_eq!(tally.nays, 1000u32.into(), "changed vote was not recorded");
+
+        Ok(())
     }
 
     #[benchmark]
@@ -220,6 +226,8 @@ pub mod benchmarks {
 
         #[extrinsic_call]
         _(RawOrigin::Signed(proposer), 0);
+
+        Ok(())
     }
 
     #[benchmark]
@@ -228,12 +236,13 @@ pub mod benchmarks {
 
         #[extrinsic_call]
         _(RawOrigin::Root, ref_index);
+
+        Ok(())
     }
 
     // This measures the path of `launch_next` public. Not currently used as we simply
     // assume the weight is `MaxBlockWeight` when executing.
-    #[extra]
-    #[benchmark]
+    #[benchmark(extra)]
     pub fn on_initialize_public(r: Linear<0, 99>) -> Result<(), BenchmarkError> {
         for i in 0..r {
             add_referendum::<T>(i);
@@ -262,6 +271,7 @@ pub mod benchmarks {
                 }
             }
         }
+        Ok(())
     }
 
     // No launch no maturing referenda.
@@ -294,6 +304,7 @@ pub mod benchmarks {
                 }
             }
         }
+        Ok(())
     }
 
     #[benchmark]
@@ -327,6 +338,7 @@ pub mod benchmarks {
                 }
             }
         }
+        Ok(())
     }
 
     #[benchmark]
@@ -335,6 +347,7 @@ pub mod benchmarks {
 
         #[extrinsic_call]
         _(RawOrigin::Root);
+        Ok(())
     }
 
     #[benchmark]
@@ -358,6 +371,7 @@ pub mod benchmarks {
 
         let Voting { votes, .. } = VotingOf::<T>::get(&caller);
         assert_eq!(votes.len(), (r - 1) as usize, "Vote was not removed");
+        Ok(())
     }
 
     #[benchmark]

crates/democracy/src/lib.rs

@@ -132,7 +132,6 @@ pub mod pallet {
     const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
 
     #[pallet::pallet]
-    #[pallet::generate_store(pub(super) trait Store)]
     #[pallet::storage_version(STORAGE_VERSION)]
     pub struct Pallet<T>(_);
 
@@ -365,7 +364,7 @@ pub mod pallet {
         fn on_initialize(n: T::BlockNumber) -> Weight {
             Self::begin_block(n).unwrap_or_else(|e| {
                 sp_runtime::print(e);
-                Weight::from_ref_time(0 as u64)
+                Weight::from_parts(0 as u64, 0u64)
             })
         }
     }
@@ -931,7 +930,7 @@ impl<T: Config> Pallet<T> {
     /// # </weight>
     fn begin_block(now: T::BlockNumber) -> Result<Weight, DispatchError> {
         let max_block_weight = T::BlockWeights::get().max_block;
-        let mut weight = Weight::from_ref_time(0 as u64);
+        let mut weight = Weight::from_parts(0 as u64, 0u64);
 
         let next = Self::lowest_unbaked();
         let last = Self::referendum_count();

crates/dex-general/rpc/src/lib.rs

@@ -102,9 +102,9 @@ where
         at: Option<<Block as BlockT>::Hash>,
     ) -> RpcResult<NumberOrHex> {
         let api = self.client.runtime_api();
-        let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
 
-        api.get_amount_in_price(&at, supply, path)
+        api.get_amount_in_price(at, supply, path)
             .map(|price| price.into())
             .map_err(runtime_error_into_rpc_err)
     }
@@ -117,9 +117,9 @@ where
         at: Option<<Block as BlockT>::Hash>,
     ) -> RpcResult<NumberOrHex> {
         let api = self.client.runtime_api();
-        let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
 
-        api.get_amount_out_price(&at, supply, path)
+        api.get_amount_out_price(at, supply, path)
             .map(|price| price.into())
             .map_err(runtime_error_into_rpc_err)
     }
@@ -135,10 +135,10 @@ where
         at: Option<<Block as BlockT>::Hash>,
     ) -> RpcResult<NumberOrHex> {
         let api = self.client.runtime_api();
-        let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
 
         api.get_estimate_lptoken(
-            &at,
+            at,
             asset_0,
             asset_1,
             amount_0_desired,
@@ -157,9 +157,9 @@ where
         at: Option<<Block as BlockT>::Hash>,
     ) -> RpcResult<Option<PairInfo<AccountId, NumberOrHex, AssetId>>> {
         let api = self.client.runtime_api();
-        let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
 
-        api.get_pair_by_asset_id(&at, asset_0, asset_1)
+        api.get_pair_by_asset_id(at, asset_0, asset_1)
             .map(|pairs| {
                 pairs.map(|pair| PairInfo {
                     asset_0: pair.asset_0,
@@ -184,9 +184,9 @@ where
         at: Option<<Block as BlockT>::Hash>,
     ) -> RpcResult<Option<(AssetBalance, AssetBalance)>> {
         let api = self.client.runtime_api();
-        let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash));
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
 
-        api.calculate_remove_liquidity(&at, asset_0, asset_1, amount)
+        api.calculate_remove_liquidity(at, asset_0, asset_1, amount)
             .map_err(runtime_error_into_rpc_err)
     }
 }

crates/dex-general/src/lib.rs

@@ -102,7 +102,6 @@ pub mod pallet {
     }
 
     #[pallet::pallet]
-    #[pallet::generate_store(pub(super) trait Store)]
     pub struct Pallet<T>(_);
 
     #[pallet::storage]