From 846927aa48147e5c5c2db329863dd072a7236e5f Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Thu, 12 Jan 2023 05:46:50 +0800 Subject: [PATCH] Switch to Rust-1.66 --- .github/workflows/benchmark.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/test.yml | 8 +++--- .github/workflows/test.yml.src | 2 +- .github/workflows/update-tokens.yml | 2 +- ecosystem-modules/ren/renvm-bridge/src/lib.rs | 6 ++--- modules/cdp-engine/src/lib.rs | 10 +++---- modules/collator-selection/src/lib.rs | 10 +++---- modules/dex-oracle/src/lib.rs | 16 ++++++------ modules/dex/src/lib.rs | 2 +- modules/evm-accounts/src/lib.rs | 4 +-- modules/evm/src/lib.rs | 26 +++++++++---------- modules/evm/src/runner/stack.rs | 4 +-- modules/evm/src/runner/state.rs | 2 +- modules/homa-lite/src/lib.rs | 4 +-- modules/honzon/src/lib.rs | 2 +- modules/incentives/src/lib.rs | 4 +-- modules/support/src/stable_asset.rs | 8 +++--- modules/transaction-pause/src/lib.rs | 6 ++--- node/service/src/chain_spec/mandala.rs | 2 +- primitives/src/bonding/controller.rs | 12 ++++----- runtime/common/src/check_nonce.rs | 4 +-- scripts/Dockerfile | 4 +-- scripts/init.sh | 4 +-- scripts/profiling/Dockerfile | 4 +-- 25 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index bb243ca68..182958c5b 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -75,7 +75,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown default: true diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a9d5b9518..c05d6d9a7 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -40,7 +40,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6c3f8c70..b7da28b21 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,7 +37,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -69,7 +69,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -89,7 +89,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -117,7 +117,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake diff --git a/.github/workflows/test.yml.src b/.github/workflows/test.yml.src index 9ba44aa36..e374ccbf5 100644 --- a/.github/workflows/test.yml.src +++ b/.github/workflows/test.yml.src @@ -41,7 +41,7 @@ jobs: name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Check format diff --git a/.github/workflows/update-tokens.yml b/.github/workflows/update-tokens.yml index 85b2d4da2..eda438419 100644 --- a/.github/workflows/update-tokens.yml +++ b/.github/workflows/update-tokens.yml @@ -20,7 +20,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: update tokens diff --git a/ecosystem-modules/ren/renvm-bridge/src/lib.rs b/ecosystem-modules/ren/renvm-bridge/src/lib.rs index 2bfbb850c..daa3b95f6 100644 --- a/ecosystem-modules/ren/renvm-bridge/src/lib.rs +++ b/ecosystem-modules/ren/renvm-bridge/src/lib.rs @@ -233,7 +233,7 @@ pub mod module { sig, } => { // check if already exists - if Signatures::::contains_key(&sig) { + if Signatures::::contains_key(sig) { return InvalidTransaction::Stale.into(); } @@ -255,7 +255,7 @@ pub mod module { } Call::rotate_key { new_key, sig } => { // check if already exists - if Signatures::::contains_key(&sig) { + if Signatures::::contains_key(sig) { return InvalidTransaction::Stale.into(); } @@ -287,7 +287,7 @@ impl Pallet { fn do_rotate_key(new_key: PublicKey, sig: EcdsaSignature) { RenVmPublicKey::::set(Some(new_key)); - Signatures::::insert(&sig, ()); + Signatures::::insert(sig, ()); } // ABI-encode the values for creating the signature hash. diff --git a/modules/cdp-engine/src/lib.rs b/modules/cdp-engine/src/lib.rs index 041fb5abd..df4240f19 100644 --- a/modules/cdp-engine/src/lib.rs +++ b/modules/cdp-engine/src/lib.rs @@ -899,7 +899,7 @@ impl Pallet { debit_adjustment: Amount, ) -> DispatchResult { ensure!( - CollateralParams::::contains_key(¤cy_id), + CollateralParams::::contains_key(currency_id), Error::::InvalidCollateralType, ); >::adjust_position(who, currency_id, collateral_adjustment, debit_adjustment)?; @@ -978,7 +978,7 @@ impl Pallet { min_increase_collateral: Balance, ) -> DispatchResult { ensure!( - CollateralParams::::contains_key(¤cy_id), + CollateralParams::::contains_key(currency_id), Error::::InvalidCollateralType, ); let loans_module_account = >::account_id(); @@ -1037,7 +1037,7 @@ impl Pallet { let debit_adjustment = >::amount_try_from_balance(increase_debit_balance)?; >::update_loan(who, currency_id, collateral_adjustment, debit_adjustment)?; - let Position { collateral, debit } = >::positions(currency_id, &who); + let Position { collateral, debit } = >::positions(currency_id, who); // check the CDP if is still at valid risk Self::check_position_valid(currency_id, collateral, debit, false)?; // debit cap check due to new issued stable coin @@ -1059,13 +1059,13 @@ impl Pallet { min_decrease_debit_value: Balance, ) -> DispatchResult { ensure!( - CollateralParams::::contains_key(¤cy_id), + CollateralParams::::contains_key(currency_id), Error::::InvalidCollateralType, ); let loans_module_account = >::account_id(); let stable_currency_id = T::GetStableCurrencyId::get(); - let Position { collateral, debit } = >::positions(currency_id, &who); + let Position { collateral, debit } = >::positions(currency_id, who); // ensure collateral of CDP is enough ensure!(decrease_collateral <= collateral, Error::::CollateralNotEnough); diff --git a/modules/collator-selection/src/lib.rs b/modules/collator-selection/src/lib.rs index 049d962a3..49bcc0a1e 100644 --- a/modules/collator-selection/src/lib.rs +++ b/modules/collator-selection/src/lib.rs @@ -251,8 +251,8 @@ pub mod pallet { "genesis desired_candidates are more than T::MaxCandidates", ); - >::put(&self.desired_candidates); - >::put(&self.candidacy_bond); + >::put(self.desired_candidates); + >::put(self.candidacy_bond); >::put(&bounded_invulnerables); } } @@ -315,7 +315,7 @@ pub mod pallet { if max > T::MaxCandidates::get() { Err(Error::::MaxCandidatesExceeded)?; } - >::put(&max); + >::put(max); Self::deposit_event(Event::NewDesiredCandidates { new_desired_candidates: max, }); @@ -326,7 +326,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::set_candidacy_bond())] pub fn set_candidacy_bond(origin: OriginFor, #[pallet::compact] bond: BalanceOf) -> DispatchResult { T::UpdateOrigin::ensure_origin(origin)?; - >::put(&bond); + >::put(bond); Self::deposit_event(Event::NewCandidacyBond { new_candidacy_bond: bond, }); @@ -515,7 +515,7 @@ pub mod pallet { candidates.iter().for_each(|candidate| { if validators.contains(candidate) { collators.push(candidate); - >::insert(&candidate, 0); + >::insert(candidate, 0); } }); diff --git a/modules/dex-oracle/src/lib.rs b/modules/dex-oracle/src/lib.rs index 009a41fd5..d7f95a09d 100644 --- a/modules/dex-oracle/src/lib.rs +++ b/modules/dex-oracle/src/lib.rs @@ -119,7 +119,7 @@ pub mod module { let (pool_0, pool_1) = T::DEX::get_liquidity_pool(trading_pair.first(), trading_pair.second()); Self::try_update_cumulative(&trading_pair, pool_0, pool_1); - let (cumulative_0, cumulative_1, _) = Self::cumulatives(&trading_pair); + let (cumulative_0, cumulative_1, _) = Self::cumulatives(trading_pair); let u256_elapsed_time: U256 = elapsed_time.saturated_into::().into(); let average_price_0 = ExchangeRate::from_inner( cumulative_0 @@ -137,7 +137,7 @@ pub mod module { ); AveragePrices::::insert( - &trading_pair, + trading_pair, ( average_price_0, average_price_1, @@ -179,7 +179,7 @@ pub mod module { let trading_pair = TradingPair::from_currency_ids(currency_id_a, currency_id_b).ok_or(Error::::InvalidCurrencyId)?; ensure!( - Self::average_prices(&trading_pair).is_none(), + Self::average_prices(trading_pair).is_none(), Error::::AveragePriceAlreadyEnabled ); ensure!(!interval.is_zero(), Error::::IntervalIsZero,); @@ -191,7 +191,7 @@ pub mod module { let initial_cumulative_1 = U256::zero(); AveragePrices::::insert( - &trading_pair, + trading_pair, ( initial_price_0, initial_price_1, @@ -201,7 +201,7 @@ pub mod module { interval, ), ); - Cumulatives::::insert(&trading_pair, (initial_cumulative_0, initial_cumulative_1, now)); + Cumulatives::::insert(trading_pair, (initial_cumulative_0, initial_cumulative_1, now)); Ok(()) } @@ -224,8 +224,8 @@ pub mod module { let trading_pair = TradingPair::from_currency_ids(currency_id_a, currency_id_b).ok_or(Error::::InvalidCurrencyId)?; - AveragePrices::::take(&trading_pair).ok_or(Error::::AveragePriceMustBeEnabled)?; - Cumulatives::::remove(&trading_pair); + AveragePrices::::take(trading_pair).ok_or(Error::::AveragePriceMustBeEnabled)?; + Cumulatives::::remove(trading_pair); Ok(()) } @@ -250,7 +250,7 @@ pub mod module { let trading_pair = TradingPair::from_currency_ids(currency_id_a, currency_id_b).ok_or(Error::::InvalidCurrencyId)?; - AveragePrices::::try_mutate_exists(&trading_pair, |maybe| -> DispatchResult { + AveragePrices::::try_mutate_exists(trading_pair, |maybe| -> DispatchResult { let (_, _, _, _, _, update_interval) = maybe.as_mut().ok_or(Error::::AveragePriceMustBeEnabled)?; ensure!(!new_interval.is_zero(), Error::::IntervalIsZero); *update_interval = new_interval; diff --git a/modules/dex/src/lib.rs b/modules/dex/src/lib.rs index c86e9946b..8eccec881 100644 --- a/modules/dex/src/lib.rs +++ b/modules/dex/src/lib.rs @@ -951,7 +951,7 @@ impl Pallet { Error::::InvalidContributionIncrement ); - ProvisioningPool::::try_mutate_exists(trading_pair, &who, |maybe_pool| -> DispatchResult { + ProvisioningPool::::try_mutate_exists(trading_pair, who, |maybe_pool| -> DispatchResult { let existed = maybe_pool.is_some(); let mut pool = maybe_pool.unwrap_or_default(); pool.0 = pool.0.checked_add(contribution_0).ok_or(ArithmeticError::Overflow)?; diff --git a/modules/evm-accounts/src/lib.rs b/modules/evm-accounts/src/lib.rs index 2f1666b9c..bb733bbb9 100644 --- a/modules/evm-accounts/src/lib.rs +++ b/modules/evm-accounts/src/lib.rs @@ -315,8 +315,8 @@ where let addr = account_to_default_evm_address(account_id); // create reverse mapping - Accounts::::insert(&addr, &account_id); - EvmAddresses::::insert(&account_id, &addr); + Accounts::::insert(addr, account_id); + EvmAddresses::::insert(account_id, addr); Pallet::::deposit_event(Event::ClaimAccount { account_id: account_id.clone(), diff --git a/modules/evm/src/lib.rs b/modules/evm/src/lib.rs index be355a5a9..e5488c471 100644 --- a/modules/evm/src/lib.rs +++ b/modules/evm/src/lib.rs @@ -1308,11 +1308,11 @@ impl Pallet { let account_info = account_info.as_mut().ok_or(Error::::ContractNotFound)?; let contract_info = account_info.contract_info.take().ok_or(Error::::ContractNotFound)?; - CodeInfos::::mutate_exists(&contract_info.code_hash, |maybe_code_info| { + CodeInfos::::mutate_exists(contract_info.code_hash, |maybe_code_info| { if let Some(code_info) = maybe_code_info.as_mut() { code_info.ref_count = code_info.ref_count.saturating_sub(1); if code_info.ref_count == 0 { - Codes::::remove(&contract_info.code_hash); + Codes::::remove(contract_info.code_hash); *maybe_code_info = None; } } else { @@ -1344,14 +1344,14 @@ impl Pallet { /// Only used in `remove_account_if_empty` fn remove_account(address: &EvmAddress) -> DispatchResult { // Deref code, and remove it if ref count is zero. - Accounts::::mutate_exists(&address, |maybe_account| { + Accounts::::mutate_exists(address, |maybe_account| { if let Some(account) = maybe_account { if let Some(ContractInfo { code_hash, .. }) = account.contract_info { - CodeInfos::::mutate_exists(&code_hash, |maybe_code_info| { + CodeInfos::::mutate_exists(code_hash, |maybe_code_info| { if let Some(code_info) = maybe_code_info { code_info.ref_count = code_info.ref_count.saturating_sub(1); if code_info.ref_count == 0 { - Codes::::remove(&code_hash); + Codes::::remove(code_hash); *maybe_code_info = None; } } @@ -1403,7 +1403,7 @@ impl Pallet { published: publish, }; - CodeInfos::::mutate_exists(&code_hash, |maybe_code_info| { + CodeInfos::::mutate_exists(code_hash, |maybe_code_info| { if let Some(code_info) = maybe_code_info.as_mut() { code_info.ref_count = code_info.ref_count.saturating_add(1); } else { @@ -1413,7 +1413,7 @@ impl Pallet { }; *maybe_code_info = Some(new); - Codes::::insert(&code_hash, bounded_code); + Codes::::insert(code_hash, bounded_code); } }); @@ -1474,7 +1474,7 @@ impl Pallet { /// Get code at given address. pub fn code_at_address(address: &EvmAddress) -> BoundedVec { - Self::codes(&Self::code_hash_at_address(address)) + Self::codes(Self::code_hash_at_address(address)) } pub fn is_contract(address: &EvmAddress) -> bool { @@ -1598,7 +1598,7 @@ impl Pallet { T::NetworkContractSource::get() }; - let old_code_info = Self::code_infos(&contract_info.code_hash).ok_or(Error::::ContractNotFound)?; + let old_code_info = Self::code_infos(contract_info.code_hash).ok_or(Error::::ContractNotFound)?; let bounded_code: BoundedVec = code.try_into().map_err(|_| Error::::ContractExceedsMaxCodeSize)?; @@ -1621,17 +1621,17 @@ impl Pallet { Self::update_contract_storage_size(&contract, storage_size_changed); // try remove old codes - CodeInfos::::mutate_exists(&contract_info.code_hash, |maybe_code_info| -> DispatchResult { + CodeInfos::::mutate_exists(contract_info.code_hash, |maybe_code_info| -> DispatchResult { let code_info = maybe_code_info.as_mut().ok_or(Error::::ContractNotFound)?; code_info.ref_count = code_info.ref_count.saturating_sub(1); if code_info.ref_count == 0 { - Codes::::remove(&contract_info.code_hash); + Codes::::remove(contract_info.code_hash); *maybe_code_info = None; } Ok(()) })?; - CodeInfos::::mutate_exists(&code_hash, |maybe_code_info| { + CodeInfos::::mutate_exists(code_hash, |maybe_code_info| { if let Some(code_info) = maybe_code_info.as_mut() { code_info.ref_count = code_info.ref_count.saturating_add(1); } else { @@ -1641,7 +1641,7 @@ impl Pallet { }; *maybe_code_info = Some(new); - Codes::::insert(&code_hash, bounded_code); + Codes::::insert(code_hash, bounded_code); } }); // update code_hash diff --git a/modules/evm/src/runner/stack.rs b/modules/evm/src/runner/stack.rs index f16bdf089..0f371538d 100644 --- a/modules/evm/src/runner/stack.rs +++ b/modules/evm/src/runner/stack.rs @@ -674,7 +674,7 @@ impl<'vicinity, 'config, T: Config> BackendT for SubstrateStackState<'vicinity, } fn storage(&self, address: H160, index: H256) -> H256 { - AccountStorages::::get(&address, index) + AccountStorages::::get(address, index) } fn original_storage(&self, address: H160, index: H256) -> Option { @@ -724,7 +724,7 @@ impl<'vicinity, 'config, T: Config> StackStateT<'config> for SubstrateStackState } fn inc_nonce(&mut self, address: H160) { - Accounts::::mutate(&address, |maybe_account| { + Accounts::::mutate(address, |maybe_account| { if let Some(account) = maybe_account.as_mut() { account.nonce += One::one() } else { diff --git a/modules/evm/src/runner/state.rs b/modules/evm/src/runner/state.rs index 42a1aafd2..e94e0312d 100644 --- a/modules/evm/src/runner/state.rs +++ b/modules/evm/src/runner/state.rs @@ -711,7 +711,7 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet> StackExecu salt, } => { let mut hasher = Keccak256::new(); - hasher.update(&[0xff]); + hasher.update([0xff]); hasher.update(&caller[..]); hasher.update(&salt[..]); hasher.update(&code_hash[..]); diff --git a/modules/homa-lite/src/lib.rs b/modules/homa-lite/src/lib.rs index fed7cdac6..a96cb0122 100644 --- a/modules/homa-lite/src/lib.rs +++ b/modules/homa-lite/src/lib.rs @@ -783,7 +783,7 @@ pub mod module { redeemer: &T::AccountId, liquid_amount_to_redeem: Balance, ) -> Result { - RedeemRequests::::mutate_exists(&redeemer, |request| { + RedeemRequests::::mutate_exists(redeemer, |request| { let (request_amount, extra_fee) = request.unwrap_or_default(); // If the redeem request doesn't exist, return. if request_amount.is_zero() { @@ -981,7 +981,7 @@ pub mod module { return Ok(0); } - RedeemRequests::::mutate_exists(&redeemer, |request| { + RedeemRequests::::mutate_exists(redeemer, |request| { let (request_amount, extra_fee) = request.unwrap_or_default(); // If the redeem request doesn't exist, return. if request_amount.is_zero() { diff --git a/modules/honzon/src/lib.rs b/modules/honzon/src/lib.rs index a4a5851f6..96724caf1 100644 --- a/modules/honzon/src/lib.rs +++ b/modules/honzon/src/lib.rs @@ -456,7 +456,7 @@ impl HonzonManager for Pal } fn get_current_collateral_ratio(who: &T::AccountId, currency_id: CurrencyId) -> Option { - let Position { collateral, debit } = >::positions(currency_id, &who); + let Position { collateral, debit } = >::positions(currency_id, who); let stable_currency_id = T::GetStableCurrencyId::get(); T::PriceSource::get_relative_price(currency_id, stable_currency_id) diff --git a/modules/incentives/src/lib.rs b/modules/incentives/src/lib.rs index f85df6142..9cd3aa9ef 100644 --- a/modules/incentives/src/lib.rs +++ b/modules/incentives/src/lib.rs @@ -325,7 +325,7 @@ pub mod module { if let PoolId::Dex(currency_id) = pool_id { ensure!(currency_id.is_dex_share_currency_id(), Error::::InvalidPoolId); } - ClaimRewardDeductionRates::::mutate_exists(&pool_id, |maybe_rate| -> DispatchResult { + ClaimRewardDeductionRates::::mutate_exists(pool_id, |maybe_rate| -> DispatchResult { let mut v = maybe_rate.unwrap_or_default(); if deduction_rate != *v.inner() { v.try_set(deduction_rate).map_err(|_| Error::::InvalidRate)?; @@ -402,7 +402,7 @@ impl Pallet { // orml_rewards will claim rewards for all currencies rewards >::claim_rewards(&who, &pool_id); - let pending_multi_rewards: BTreeMap = PendingMultiRewards::::take(&pool_id, &who); + let pending_multi_rewards: BTreeMap = PendingMultiRewards::::take(pool_id, &who); let deduction_rate = Self::claim_reward_deduction_rates(&pool_id); for (currency_id, pending_reward) in pending_multi_rewards { diff --git a/modules/support/src/stable_asset.rs b/modules/support/src/stable_asset.rs index 2463347e0..669c7ecd7 100644 --- a/modules/support/src/stable_asset.rs +++ b/modules/support/src/stable_asset.rs @@ -110,7 +110,7 @@ where .iter() .enumerate() .map(|(index, amount)| { - if let Some(currency_id) = pool_info.assets.get(index as usize) { + if let Some(currency_id) = pool_info.assets.get(index) { RebaseTokenAmountConvertor::convert_balance(*amount, *currency_id) } else { *amount @@ -170,7 +170,7 @@ where .iter() .enumerate() .map(|(index, redeem_amount)| { - if let Some(currency_id) = pool_info.assets.get(index as usize) { + if let Some(currency_id) = pool_info.assets.get(index) { RebaseTokenAmountConvertor::convert_balance(*redeem_amount, *currency_id) } else { *redeem_amount @@ -212,7 +212,7 @@ where .iter() .enumerate() .map(|(index, amount)| { - if let Some(currency_id) = pool_info.assets.get(index as usize) { + if let Some(currency_id) = pool_info.assets.get(index) { RebaseTokenAmountConvertor::convert_balance(*amount, *currency_id) } else { *amount @@ -326,7 +326,7 @@ where .iter() .enumerate() .map(|(index, amount)| { - if let Some(currency_id) = pool_info.assets.get(index as usize) { + if let Some(currency_id) = pool_info.assets.get(index) { RebaseTokenAmountConvertor::convert_balance_back(*amount, *currency_id) } else { *amount diff --git a/modules/transaction-pause/src/lib.rs b/modules/transaction-pause/src/lib.rs index 6432d7403..ca0a80db3 100644 --- a/modules/transaction-pause/src/lib.rs +++ b/modules/transaction-pause/src/lib.rs @@ -150,7 +150,7 @@ pub mod module { #[transactional] pub fn pause_evm_precompile(origin: OriginFor, address: H160) -> DispatchResult { T::UpdateOrigin::ensure_origin(origin)?; - PausedEvmPrecompiles::::mutate_exists(&address, |maybe_paused| { + PausedEvmPrecompiles::::mutate_exists(address, |maybe_paused| { if maybe_paused.is_none() { *maybe_paused = Some(()); Self::deposit_event(Event::EvmPrecompilePaused { address }); @@ -164,7 +164,7 @@ pub mod module { #[transactional] pub fn unpause_evm_precompile(origin: OriginFor, address: H160) -> DispatchResult { T::UpdateOrigin::ensure_origin(origin)?; - if PausedEvmPrecompiles::::take(&address).is_some() { + if PausedEvmPrecompiles::::take(address).is_some() { Self::deposit_event(Event::EvmPrecompileUnpaused { address }); }; Ok(()) @@ -189,6 +189,6 @@ where pub struct PausedPrecompileFilter(sp_std::marker::PhantomData); impl module_support::PrecompilePauseFilter for PausedPrecompileFilter { fn is_paused(address: H160) -> bool { - PausedEvmPrecompiles::::contains_key(&address) + PausedEvmPrecompiles::::contains_key(address) } } diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index d4900785f..7d8383b08 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -69,7 +69,7 @@ fn generate_evm_address(phrase: &str, index: u32) -> H160 { .expect("should parse the default derivation path"); let mnemonic = Mnemonic::::new_from_phrase(phrase).unwrap(); - let derived_priv_key = mnemonic.derive_key(&derivation_path, None).unwrap(); + let derived_priv_key = mnemonic.derive_key(derivation_path, None).unwrap(); let key: &SigningKey = derived_priv_key.as_ref(); let secret_key: SigningKey = SigningKey::from_bytes(&key.to_bytes()).unwrap(); let verify_key: VerifyingKey = secret_key.verifying_key(); diff --git a/primitives/src/bonding/controller.rs b/primitives/src/bonding/controller.rs index 2212a7af8..d33efff9c 100644 --- a/primitives/src/bonding/controller.rs +++ b/primitives/src/bonding/controller.rs @@ -73,7 +73,7 @@ where let ledger = ledger.bond(bond_amount).map_err(Self::convert_error)?; - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); Self::apply_ledger(who, &ledger)?; Ok(Some(BondChange { @@ -93,7 +93,7 @@ where return Ok(None); } - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); Self::apply_ledger(who, &ledger)?; Ok(Some(BondChange { @@ -113,7 +113,7 @@ where return Ok(None); } - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); Self::apply_ledger(who, &ledger)?; Ok(Some(BondChange { @@ -133,7 +133,7 @@ where return Ok(None); } - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); Self::apply_ledger(who, &ledger)?; Ok(Some(BondChange { @@ -158,9 +158,9 @@ where } if new_total == 0 { - Self::Ledger::remove(&who); + Self::Ledger::remove(who); } else { - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); } Self::apply_ledger(who, &ledger)?; diff --git a/runtime/common/src/check_nonce.rs b/runtime/common/src/check_nonce.rs index 1784fc8b0..b92fa1b47 100644 --- a/runtime/common/src/check_nonce.rs +++ b/runtime/common/src/check_nonce.rs @@ -116,7 +116,7 @@ where // should check evm nonce let address = ::AddressMapping::get_evm_address(who) .unwrap_or_else(|| ::AddressMapping::get_default_evm_address(who)); - let evm_nonce = module_evm::Accounts::::get(&address) + let evm_nonce = module_evm::Accounts::::get(address) .map(|x| x.nonce) .unwrap_or_default(); if self.nonce != evm_nonce { @@ -151,7 +151,7 @@ where // should check evm nonce let address = ::AddressMapping::get_evm_address(who) .unwrap_or_else(|| ::AddressMapping::get_default_evm_address(who)); - let evm_nonce = module_evm::Accounts::::get(&address) + let evm_nonce = module_evm::Accounts::::get(address) .map(|x| x.nonce) .unwrap_or_default(); if self.nonce < evm_nonce { diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 9abb83576..ed4584615 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,8 +1,8 @@ FROM rust:buster as builder WORKDIR /app -RUN rustup default nightly-2022-08-05 && \ - rustup target add wasm32-unknown-unknown --toolchain nightly-2022-08-05 +RUN rustup default nightly-2022-10-30 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2022-10-30 RUN apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \ diff --git a/scripts/init.sh b/scripts/init.sh index 117b46734..04ba04880 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -4,6 +4,6 @@ set -e echo "*** Initializing WASM build environment" -rustup default nightly-2022-08-05 +rustup default nightly-2022-10-30 -rustup target add wasm32-unknown-unknown --toolchain nightly-2022-08-05 +rustup target add wasm32-unknown-unknown --toolchain nightly-2022-10-30 diff --git a/scripts/profiling/Dockerfile b/scripts/profiling/Dockerfile index d4639702e..65d1dfe47 100644 --- a/scripts/profiling/Dockerfile +++ b/scripts/profiling/Dockerfile @@ -1,8 +1,8 @@ FROM rust:buster as builder WORKDIR /app -RUN rustup default nightly-2022-08-05 && \ - rustup target add wasm32-unknown-unknown --toolchain nightly-2022-08-05 +RUN rustup default nightly-2022-10-30 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2022-10-30 RUN apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \