difftreelog
fix clippy warnings
in: master
36 files changed
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -110,7 +110,7 @@
/// Helper function to generate a crypto pair from seed
pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
- TPublic::Pair::from_string(&format!("//{}", seed), None)
+ TPublic::Pair::from_string(&format!("//{seed}"), None)
.expect("static values are valid; qed")
.public()
}
node/cli/src/command.rsdiffbeforeafterboth--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -83,7 +83,7 @@
"" | "local" => Box::new(chain_spec::local_testnet_config()),
path => {
let path = std::path::PathBuf::from(path);
- let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path.clone())?)
+ let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path)?)
as Box<dyn sc_service::ChainSpec>;
match chain_spec.runtime_id() {
@@ -352,7 +352,7 @@
&polkadot_cli,
config.tokio_handle.clone(),
)
- .map_err(|err| format!("Relay chain argument error: {}", err))?;
+ .map_err(|err| format!("Relay chain argument error: {err}"))?;
cmd.run(config, polkadot_config)
})
@@ -464,7 +464,7 @@
runner.run_node_until_exit(|config| async move {
let hwbench = if !cli.no_hardware_benchmarks {
config.database.path().map(|database_path| {
- let _ = std::fs::create_dir_all(&database_path);
+ let _ = std::fs::create_dir_all(database_path);
sc_sysinfo::gather_hwbench(Some(database_path))
})
} else {
@@ -513,7 +513,7 @@
let state_version =
RelayChainCli::native_runtime_version(&config.chain_spec).state_version();
let block: Block = generate_genesis_block(&*config.chain_spec, state_version)
- .map_err(|e| format!("{:?}", e))?;
+ .map_err(|e| format!("{e:?}"))?;
let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
let genesis_hash = format!("0x{:?}", HexDisplay::from(&block.header().hash().0));
@@ -522,7 +522,7 @@
&polkadot_cli,
config.tokio_handle.clone(),
)
- .map_err(|err| format!("Relay chain argument error: {}", err))?;
+ .map_err(|err| format!("Relay chain argument error: {err}"))?;
info!("Parachain id: {:?}", para_id);
info!("Parachain Account: {}", parachain_account);
node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -698,7 +698,7 @@
{
let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
- let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
+ let block_import = ParachainBlockImport::new(client.clone(), backend);
cumulus_client_consensus_aura::import_queue::<
sp_consensus_aura::sr25519::AuthorityPair,
@@ -709,7 +709,7 @@
_,
>(cumulus_client_consensus_aura::ImportQueueParams {
block_import,
- client: client.clone(),
+ client,
create_inherent_data_providers: move |_, _| async move {
let time = sp_timestamp::InherentDataProvider::from_system_time();
@@ -787,7 +787,7 @@
telemetry.clone(),
);
- let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
+ let block_import = ParachainBlockImport::new(client.clone(), backend);
Ok(AuraConsensus::build::<
sp_consensus_aura::sr25519::AuthorityPair,
@@ -864,7 +864,7 @@
ExecutorDispatch: NativeExecutionDispatch + 'static,
{
Ok(sc_consensus_manual_seal::import_queue(
- Box::new(client.clone()),
+ Box::new(client),
&task_manager.spawn_essential_handle(),
config.prometheus_registry(),
))
@@ -956,7 +956,7 @@
let collator = config.role.is_authority();
- let select_chain = maybe_select_chain.clone();
+ let select_chain = maybe_select_chain;
if collator {
let block_import =
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -289,7 +289,7 @@
io.merge(
Net::new(
client.clone(),
- network.clone(),
+ network,
// Whether to format the `peer_count` response as Hex (default) or not.
true,
)
pallets/app-promotion/src/lib.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/lib.rs
+++ b/pallets/app-promotion/src/lib.rs
@@ -296,7 +296,7 @@
if !block_pending.is_empty() {
block_pending.into_iter().for_each(|(staker, amount)| {
- Self::get_frozen_balance(&staker).map(|b| {
+ if let Some(b) = Self::get_frozen_balance(&staker) {
let new_state = b.checked_sub(&amount).unwrap_or_default();
// In this case, setting a new state for the frozen funds cannot fail
@@ -305,7 +305,7 @@
// that we cannot (in the current implementation) unfreeze more funds
// than were originally frozen by the pallet. Either way, `on_initialize()` cannot fail.
Self::set_freeze_unchecked(&staker, new_state);
- });
+ };
});
}
@@ -598,8 +598,8 @@
// this value is set for the stakers to whom the recalculation will be performed
let next_recalc_block = current_recalc_block + config.recalculation_interval;
- let mut storage_iterator = Self::get_next_calculated_key()
- .map_or(Staked::<T>::iter(), |key| Staked::<T>::iter_from(key));
+ let storage_iterator =
+ Self::get_next_calculated_key().map_or(Staked::<T>::iter(), Staked::<T>::iter_from);
PreviousCalculatedRecord::<T>::set(None);
@@ -658,10 +658,8 @@
// stakers_number - keeps the remaining number of iterations (staker addresses to handle)
// next_recalc_block_for_stake - is taken from the state and stores the starting relay block from which reward should be paid out
// income_acc - stores the reward amount to pay to the staker address (accumulates over all address stake records)
- while let Some((
- (current_id, staked_block),
- (amount, next_recalc_block_for_stake),
- )) = storage_iterator.next()
+ for ((current_id, staked_block), (amount, next_recalc_block_for_stake)) in
+ storage_iterator
{
// last_id is not equal current_id when we switch to handling a new staker address
// or just start handling the very first address. In the latter case last_id will be None and
@@ -859,11 +857,11 @@
if acc_amount < balance_per_block {
let res = (block, balance_per_block - acc_amount);
acc_amount = <BalanceOf<T>>::default();
- return Some(res);
+ Some(res)
} else {
acc_amount -= balance_per_block;
will_deleted_stakes_count += 1;
- return Some((block, <BalanceOf<T>>::default()));
+ Some((block, <BalanceOf<T>>::default()))
}
})
.collect::<Vec<_>>();
@@ -926,7 +924,7 @@
if amount.is_zero() {
<<T as Config>::Currency as MutateFreeze<T::AccountId>>::thaw(
&T::FreezeIdentifier::get(),
- &staker,
+ staker,
)
} else {
<<T as Config>::Currency as MutateFreeze<T::AccountId>>::set_freeze(
@@ -1026,10 +1024,10 @@
) {
let income = Self::calculate_income(base, iters);
- base.checked_add(&income).map(|res| {
+ if let Some(res) = base.checked_add(&income) {
<Staked<T>>::insert((staker, staked_block), (res, next_recalc_block));
*income_acc += income;
- });
+ };
}
fn calculate_income<I>(base: I, iters: u32) -> I
pallets/app-promotion/src/types.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/types.rs
+++ b/pallets/app-promotion/src/types.rs
@@ -149,16 +149,16 @@
Self {
recalculation_interval: config
.recalculation_interval
- .unwrap_or_else(|| T::RecalculationInterval::get()),
+ .unwrap_or_else(T::RecalculationInterval::get),
pending_interval: config
.pending_interval
- .unwrap_or_else(|| T::PendingInterval::get()),
+ .unwrap_or_else(T::PendingInterval::get),
interval_income: config
.interval_income
- .unwrap_or_else(|| T::IntervalIncome::get()),
+ .unwrap_or_else(T::IntervalIncome::get),
max_stakers_per_calculation: config
.max_stakers_per_calculation
- .unwrap_or_else(|| MAX_NUMBER_PAYOUTS),
+ .unwrap_or(MAX_NUMBER_PAYOUTS),
}
}
}
pallets/balances-adapter/src/lib.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -31,6 +31,12 @@
}
}
+impl<T: Config> Default for NativeFungibleHandle<T> {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
impl<T: Config> WithRecorder<T> for NativeFungibleHandle<T> {
fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {
&self.0
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -136,7 +136,7 @@
fn try_from(from: up_data_structs::Property) -> Result<Self, Self::Error> {
let key = evm_coder::types::String::from_utf8(from.key.into())
- .map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {}", e)))?;
+ .map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {e}")))?;
let value = evm_coder::types::Bytes(from.value.to_vec());
Ok(Property { key, value })
}
@@ -201,10 +201,7 @@
pub fn new(field: CollectionLimitField, value: Option<u32>) -> Self {
Self {
field,
- value: match value {
- Some(value) => Some(value.into()),
- None => None,
- },
+ value: value.map(|value| value.into()),
}
}
/// Whether the field contains a value.
@@ -222,8 +219,7 @@
.ok_or::<Self::Error>("can't convert `None` value to boolean".into())?;
let value = Some(value.try_into().map_err(|error| {
Self::Error::Revert(format!(
- "can't convert value to u32 \"{}\" because: \"{error}\"",
- value
+ "can't convert value to u32 \"{value}\" because: \"{error}\""
))
})?);
@@ -249,10 +245,8 @@
limits.sponsored_data_size = value;
}
CollectionLimitField::SponsoredDataRateLimit => {
- limits.sponsored_data_rate_limit = match value {
- Some(value) => Some(up_data_structs::SponsoringRateLimit::Blocks(value)),
- None => None,
- };
+ limits.sponsored_data_rate_limit =
+ value.map(up_data_structs::SponsoringRateLimit::Blocks);
}
CollectionLimitField::TokenLimit => {
limits.token_limit = value;
@@ -454,9 +448,9 @@
}
}
-impl Into<up_data_structs::AccessMode> for AccessMode {
- fn into(self) -> up_data_structs::AccessMode {
- match self {
+impl From<AccessMode> for up_data_structs::AccessMode {
+ fn from(value: AccessMode) -> Self {
+ match value {
AccessMode::Normal => up_data_structs::AccessMode::Normal,
AccessMode::AllowList => up_data_structs::AccessMode::AllowList,
}
pallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -260,9 +260,9 @@
message: Some(msg), ..
}) => ExError::Revert(msg.into()),
DispatchError::Module(ModuleError { index, error, .. }) => {
- ExError::Revert(format!("error {:?} in pallet {}", error, index))
+ ExError::Revert(format!("error {error:?} in pallet {index}"))
}
- e => ExError::Revert(format!("substrate error: {:?}", e)),
+ e => ExError::Revert(format!("substrate error: {e:?}")),
}
}
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -184,10 +184,9 @@
/// @param contractAddress The contract for which a sponsor is requested.
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
fn sponsor(&self, contract_address: Address) -> Result<Option<eth::CrossAddress>> {
- Ok(match Pallet::<T>::get_sponsor(contract_address) {
- Some(ref value) => Some(eth::CrossAddress::from_sub_cross_account::<T>(value)),
- None => None,
- })
+ Ok(Pallet::<T>::get_sponsor(contract_address)
+ .as_ref()
+ .map(eth::CrossAddress::from_sub_cross_account::<T>))
}
/// Check tat contract has confirmed sponsor.
@@ -275,7 +274,7 @@
self.recorder().consume_sstore()?;
<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;
- <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())
+ <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit)
.map_err(dispatch_to_evm::<T>)?;
Ok(())
}
pallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -376,7 +376,7 @@
<SponsoringMode<T>>::get(contract)
.or_else(|| {
#[allow(deprecated)]
- <SelfSponsoring<T>>::get(contract).then(|| SponsoringModeT::Allowlisted)
+ <SelfSponsoring<T>>::get(contract).then_some(SponsoringModeT::Allowlisted)
})
.unwrap_or_default()
}
@@ -410,7 +410,7 @@
/// Is user added to allowlist, or he is owner of specified contract
pub fn allowed(contract: H160, user: H160) -> bool {
- <Allowlist<T>>::get(&contract, &user) || <Owner<T>>::get(&contract) == user
+ <Allowlist<T>>::get(contract, user) || <Owner<T>>::get(contract) == user
}
/// Toggle contract allowlist access
@@ -425,7 +425,7 @@
/// Throw error if user is not allowed to reconfigure target contract
pub fn ensure_owner(contract: H160, user: H160) -> DispatchResult {
- ensure!(<Owner<T>>::get(&contract) == user, Error::<T>::NoPermission);
+ ensure!(<Owner<T>>::get(contract) == user, Error::<T>::NoPermission);
Ok(())
}
}
pallets/evm-migration/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-migration/src/lib.rs
+++ b/pallets/evm-migration/src/lib.rs
@@ -78,7 +78,7 @@
pub fn begin(origin: OriginFor<T>, address: H160) -> DispatchResult {
ensure_root(origin)?;
ensure!(
- <PalletEvm<T>>::is_account_empty(&address) && !<MigrationPending<T>>::get(&address),
+ <PalletEvm<T>>::is_account_empty(&address) && !<MigrationPending<T>>::get(address),
<Error<T>>::AccountNotEmpty,
);
@@ -97,12 +97,12 @@
) -> DispatchResult {
ensure_root(origin)?;
ensure!(
- <MigrationPending<T>>::get(&address),
+ <MigrationPending<T>>::get(address),
<Error<T>>::AccountIsNotMigrating,
);
for (k, v) in data {
- <pallet_evm::AccountStorages<T>>::insert(&address, k, v);
+ <pallet_evm::AccountStorages<T>>::insert(address, k, v);
}
Ok(())
}
@@ -115,11 +115,11 @@
pub fn finish(origin: OriginFor<T>, address: H160, code: Vec<u8>) -> DispatchResult {
ensure_root(origin)?;
ensure!(
- <MigrationPending<T>>::get(&address),
+ <MigrationPending<T>>::get(address),
<Error<T>>::AccountIsNotMigrating,
);
- <pallet_evm::AccountCodes<T>>::insert(&address, code);
+ <pallet_evm::AccountCodes<T>>::insert(address, code);
<MigrationPending<T>>::remove(address);
Ok(())
}
@@ -166,7 +166,7 @@
pub struct OnMethodCall<T>(PhantomData<T>);
impl<T: Config> pallet_evm::OnMethodCall<T> for OnMethodCall<T> {
fn is_reserved(contract: &H160) -> bool {
- <MigrationPending<T>>::get(&contract)
+ <MigrationPending<T>>::get(contract)
}
fn is_used(_contract: &H160) -> bool {
pallets/foreign-assets/src/impl_fungibles.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! Implementations for fungibles trait.1819use super::*;20use frame_system::Config as SystemConfig;2122use frame_support::traits::tokens::{23 DepositConsequence, WithdrawConsequence, Preservation, Fortitude, Provenance, Precision,24};25use pallet_common::CollectionHandle;26use pallet_fungible::FungibleHandle;27use pallet_common::CommonCollectionOperations;28use up_data_structs::budget::Value;29use sp_runtime::traits::{CheckedAdd, CheckedSub};3031impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T>32where33 T: orml_tokens::Config<CurrencyId = AssetIds>,34 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,35 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,36 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,37 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,38{39 type AssetId = AssetIds;40 type Balance = BalanceOf<T>;4142 fn total_issuance(asset: Self::AssetId) -> Self::Balance {43 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible total_issuance");4445 match asset {46 AssetIds::NativeAssetId(NativeCurrency::Here) => {47 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::total_issuance()48 .into()49 }50 AssetIds::NativeAssetId(NativeCurrency::Parent) => {51 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::total_issuance(52 AssetIds::NativeAssetId(NativeCurrency::Parent),53 )54 .into()55 }56 AssetIds::ForeignAssetId(fid) => {57 let target_collection_id = match <AssetBinding<T>>::get(fid) {58 Some(v) => v,59 None => return Zero::zero(),60 };61 let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {62 Ok(v) => v,63 Err(_) => return Zero::zero(),64 };65 let collection = FungibleHandle::cast(collection_handle);66 Self::Balance::try_from(collection.total_supply()).unwrap_or(Zero::zero())67 }68 }69 }7071 fn minimum_balance(asset: Self::AssetId) -> Self::Balance {72 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible minimum_balance");73 match asset {74 AssetIds::NativeAssetId(NativeCurrency::Here) => {75 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::minimum_balance()76 .into()77 }78 AssetIds::NativeAssetId(NativeCurrency::Parent) => {79 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::minimum_balance(80 AssetIds::NativeAssetId(NativeCurrency::Parent),81 )82 .into()83 }84 AssetIds::ForeignAssetId(fid) => {85 AssetMetadatas::<T>::get(AssetIds::ForeignAssetId(fid))86 .map(|x| x.minimal_balance)87 .unwrap_or_else(Zero::zero)88 }89 }90 }9192 fn balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {93 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible balance");94 match asset {95 AssetIds::NativeAssetId(NativeCurrency::Here) => {96 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::balance(who).into()97 }98 AssetIds::NativeAssetId(NativeCurrency::Parent) => {99 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::balance(100 AssetIds::NativeAssetId(NativeCurrency::Parent),101 who,102 )103 .into()104 }105 AssetIds::ForeignAssetId(fid) => {106 let target_collection_id = match <AssetBinding<T>>::get(fid) {107 Some(v) => v,108 None => return Zero::zero(),109 };110 let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {111 Ok(v) => v,112 Err(_) => return Zero::zero(),113 };114 let collection = FungibleHandle::cast(collection_handle);115 Self::Balance::try_from(116 collection.balance(T::CrossAccountId::from_sub(who.clone()), TokenId(0)),117 )118 .unwrap_or(Zero::zero())119 }120 }121 }122123 fn total_balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {124 Self::balance(asset, who)125 }126127 fn reducible_balance(128 asset: Self::AssetId,129 who: &<T as SystemConfig>::AccountId,130 preservation: Preservation,131 fortitude: Fortitude,132 ) -> Self::Balance {133 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible reducible_balance");134135 match asset {136 AssetIds::NativeAssetId(NativeCurrency::Here) => {137 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::reducible_balance(138 who,139 preservation,140 fortitude,141 )142 .into()143 }144 AssetIds::NativeAssetId(NativeCurrency::Parent) => {145 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::reducible_balance(146 AssetIds::NativeAssetId(NativeCurrency::Parent),147 who,148 preservation,149 fortitude,150 )151 .into()152 }153 _ => Self::balance(asset, who),154 }155 }156157 fn can_deposit(158 asset: Self::AssetId,159 who: &<T as SystemConfig>::AccountId,160 amount: Self::Balance,161 provenance: Provenance,162 ) -> DepositConsequence {163 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_deposit");164165 match asset {166 AssetIds::NativeAssetId(NativeCurrency::Here) => {167 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_deposit(168 who,169 amount.into(),170 provenance,171 )172 }173 AssetIds::NativeAssetId(NativeCurrency::Parent) => {174 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_deposit(175 AssetIds::NativeAssetId(NativeCurrency::Parent),176 who,177 amount.into(),178 provenance,179 )180 }181 _ => {182 if amount.is_zero() {183 return DepositConsequence::Success;184 }185186 let extential_deposit_value = T::ExistentialDeposit::get();187 let ed_value: u128 = match extential_deposit_value.try_into() {188 Ok(val) => val,189 Err(_) => return DepositConsequence::CannotCreate,190 };191 let extential_deposit: Self::Balance = match ed_value.try_into() {192 Ok(val) => val,193 Err(_) => return DepositConsequence::CannotCreate,194 };195196 let new_total_balance = match Self::balance(asset, who).checked_add(&amount) {197 Some(x) => x,198 None => return DepositConsequence::Overflow,199 };200201 if new_total_balance < extential_deposit {202 return DepositConsequence::BelowMinimum;203 }204205 DepositConsequence::Success206 }207 }208 }209210 fn can_withdraw(211 asset: Self::AssetId,212 who: &<T as SystemConfig>::AccountId,213 amount: Self::Balance,214 ) -> WithdrawConsequence<Self::Balance> {215 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_withdraw");216 let value: u128 = match amount.try_into() {217 Ok(val) => val,218 Err(_) => return WithdrawConsequence::UnknownAsset,219 };220221 match asset {222 AssetIds::NativeAssetId(NativeCurrency::Here) => {223 let this_amount: <T as pallet_balances::Config>::Balance = match value.try_into() {224 Ok(val) => val,225 Err(_) => {226 return WithdrawConsequence::UnknownAsset;227 }228 };229 match <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_withdraw(230 who,231 this_amount,232 ) {233 WithdrawConsequence::BalanceLow => WithdrawConsequence::BalanceLow,234 WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,235 WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,236 WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,237 WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,238 WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,239 WithdrawConsequence::Success => WithdrawConsequence::Success,240 _ => WithdrawConsequence::BalanceLow,241 }242 }243 AssetIds::NativeAssetId(NativeCurrency::Parent) => {244 let parent_amount: <T as orml_tokens::Config>::Balance = match value.try_into() {245 Ok(val) => val,246 Err(_) => {247 return WithdrawConsequence::UnknownAsset;248 }249 };250 match <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_withdraw(251 AssetIds::NativeAssetId(NativeCurrency::Parent),252 who,253 parent_amount,254 ) {255 WithdrawConsequence::BalanceLow => WithdrawConsequence::BalanceLow,256 WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,257 WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,258 WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,259 WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,260 WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,261 WithdrawConsequence::Success => WithdrawConsequence::Success,262 _ => WithdrawConsequence::BalanceLow,263 }264 }265 _ => match Self::balance(asset, who).checked_sub(&amount) {266 Some(_) => WithdrawConsequence::Success,267 None => WithdrawConsequence::BalanceLow,268 },269 }270 }271272 fn asset_exists(asset: AssetIds) -> bool {273 match asset {274 AssetIds::NativeAssetId(_) => true,275 AssetIds::ForeignAssetId(fid) => <AssetBinding<T>>::contains_key(fid),276 }277 }278}279280impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T>281where282 T: orml_tokens::Config<CurrencyId = AssetIds>,283 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,284 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,285 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,286 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,287 u128: From<BalanceOf<T>>,288{289 fn mint_into(290 asset: Self::AssetId,291 who: &<T as SystemConfig>::AccountId,292 amount: Self::Balance,293 ) -> Result<BalanceOf<T>, DispatchError> {294 //Self::do_mint(asset, who, amount, None)295 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible mint_into {:?}", asset);296297 match asset {298 AssetIds::NativeAssetId(NativeCurrency::Here) => {299 <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::mint_into(300 who,301 amount.into(),302 )303 .map(Into::into)304 }305 AssetIds::NativeAssetId(NativeCurrency::Parent) => {306 <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::mint_into(307 AssetIds::NativeAssetId(NativeCurrency::Parent),308 who,309 amount.into(),310 )311 .map(Into::into)312 }313 AssetIds::ForeignAssetId(fid) => {314 let target_collection_id = match <AssetBinding<T>>::get(fid) {315 Some(v) => v,316 None => {317 return Err(DispatchError::Other(318 "Associated collection not found for asset",319 ))320 }321 };322 let collection =323 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);324 let account = T::CrossAccountId::from_sub(who.clone());325326 let amount_data: pallet_fungible::CreateItemData<T> =327 (account.clone(), amount.into());328329 pallet_fungible::Pallet::<T>::create_item_foreign(330 &collection,331 &account,332 amount_data,333 &Value::new(0),334 )?;335336 Ok(amount.into())337 }338 }339 }340341 fn burn_from(342 asset: Self::AssetId,343 who: &<T as SystemConfig>::AccountId,344 amount: Self::Balance,345 precision: Precision,346 fortitude: Fortitude,347 ) -> Result<Self::Balance, DispatchError> {348 // let f = DebitFlags { keep_alive: false, best_effort: false };349 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible burn_from");350351 match asset {352 AssetIds::NativeAssetId(NativeCurrency::Here) => {353 <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::burn_from(354 who,355 amount.into(),356 precision,357 fortitude,358 )359 .map(Into::into)360 }361 AssetIds::NativeAssetId(NativeCurrency::Parent) => {362 <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::burn_from(363 AssetIds::NativeAssetId(NativeCurrency::Parent),364 who,365 amount.into(),366 precision,367 fortitude,368 )369 .map(Into::into)370 }371 AssetIds::ForeignAssetId(fid) => {372 let target_collection_id = match <AssetBinding<T>>::get(fid) {373 Some(v) => v,374 None => {375 return Err(DispatchError::Other(376 "Associated collection not found for asset",377 ))378 }379 };380 let collection =381 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);382 pallet_fungible::Pallet::<T>::burn_foreign(383 &collection,384 &T::CrossAccountId::from_sub(who.clone()),385 amount.into(),386 )?;387388 Ok(amount)389 }390 }391 }392393 fn transfer(394 asset: Self::AssetId,395 source: &<T as SystemConfig>::AccountId,396 dest: &<T as SystemConfig>::AccountId,397 amount: Self::Balance,398 preservation: Preservation,399 ) -> Result<Self::Balance, DispatchError> {400 // let f = TransferFlags { keep_alive, best_effort: false, burn_dust: false };401 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible transfer");402403 match asset {404 AssetIds::NativeAssetId(NativeCurrency::Here) => {405 match <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::transfer(406 source,407 dest,408 amount.into(),409 preservation,410 ) {411 Ok(_) => Ok(amount),412 Err(_) => Err(DispatchError::Other(413 "Bad amount to relay chain value conversion",414 )),415 }416 }417 AssetIds::NativeAssetId(NativeCurrency::Parent) => {418 match <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::transfer(419 AssetIds::NativeAssetId(NativeCurrency::Parent),420 source,421 dest,422 amount.into(),423 preservation,424 ) {425 Ok(_) => Ok(amount),426 Err(e) => Err(e),427 }428 }429 AssetIds::ForeignAssetId(fid) => {430 let target_collection_id = match <AssetBinding<T>>::get(fid) {431 Some(v) => v,432 None => {433 return Err(DispatchError::Other(434 "Associated collection not found for asset",435 ))436 }437 };438 let collection =439 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);440441 pallet_fungible::Pallet::<T>::transfer(442 &collection,443 &T::CrossAccountId::from_sub(source.clone()),444 &T::CrossAccountId::from_sub(dest.clone()),445 amount.into(),446 &Value::new(0),447 )448 .map_err(|e| e.error)?;449450 Ok(amount)451 }452 }453 }454}455456#[cfg(not(debug_assertions))]457extern "C" {458 // This function does not exists, thus compilation will fail, if its call is459 // not optimized away, which is only possible if it's not called at all.460 //461 // not(debug_assertions) is used to ensure compiler is dropping unused functions, as462 // this option is enabled in release by defailt463 //464 // FIXME: maybe use build.rs, to ensure it will fail even in release with debug_assertions465 // enabled?466 fn unbalanced_fungible_is_called();467}468macro_rules! ensure_balanced {469 () => {{470 #[cfg(debug_assertions)]471 panic!("unbalanced fungible methods should not be used");472 #[cfg(not(debug_assertions))]473 {474 unsafe { unbalanced_fungible_is_called() };475 unreachable!();476 }477 }};478}479480impl<T: Config> fungibles::Unbalanced<<T as SystemConfig>::AccountId> for Pallet<T>481where482 T: orml_tokens::Config<CurrencyId = AssetIds>,483 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,484 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,485 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,486 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,487 u128: From<BalanceOf<T>>,488{489 fn handle_dust(_dust: fungibles::Dust<<T as SystemConfig>::AccountId, Self>) {490 ensure_balanced!();491 }492 fn write_balance(493 _asset: Self::AssetId,494 _who: &<T as SystemConfig>::AccountId,495 _amount: Self::Balance,496 ) -> Result<Option<Self::Balance>, DispatchError> {497 ensure_balanced!();498 }499 fn set_total_issuance(_asset: Self::AssetId, _amount: Self::Balance) {500 ensure_balanced!();501 }502}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! Implementations for fungibles trait.1819use super::*;20use frame_system::Config as SystemConfig;2122use frame_support::traits::tokens::{23 DepositConsequence, WithdrawConsequence, Preservation, Fortitude, Provenance, Precision,24};25use pallet_common::CollectionHandle;26use pallet_fungible::FungibleHandle;27use pallet_common::CommonCollectionOperations;28use up_data_structs::budget::Value;29use sp_runtime::traits::{CheckedAdd, CheckedSub};3031impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T>32where33 T: orml_tokens::Config<CurrencyId = AssetIds>,34 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,35 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,36 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,37 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,38{39 type AssetId = AssetIds;40 type Balance = BalanceOf<T>;4142 fn total_issuance(asset: Self::AssetId) -> Self::Balance {43 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible total_issuance");4445 match asset {46 AssetIds::NativeAssetId(NativeCurrency::Here) => {47 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::total_issuance()48 .into()49 }50 AssetIds::NativeAssetId(NativeCurrency::Parent) => {51 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::total_issuance(52 AssetIds::NativeAssetId(NativeCurrency::Parent),53 )54 .into()55 }56 AssetIds::ForeignAssetId(fid) => {57 let target_collection_id = match <AssetBinding<T>>::get(fid) {58 Some(v) => v,59 None => return Zero::zero(),60 };61 let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {62 Ok(v) => v,63 Err(_) => return Zero::zero(),64 };65 let collection = FungibleHandle::cast(collection_handle);66 Self::Balance::try_from(collection.total_supply()).unwrap_or(Zero::zero())67 }68 }69 }7071 fn minimum_balance(asset: Self::AssetId) -> Self::Balance {72 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible minimum_balance");73 match asset {74 AssetIds::NativeAssetId(NativeCurrency::Here) => {75 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::minimum_balance()76 .into()77 }78 AssetIds::NativeAssetId(NativeCurrency::Parent) => {79 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::minimum_balance(80 AssetIds::NativeAssetId(NativeCurrency::Parent),81 )82 .into()83 }84 AssetIds::ForeignAssetId(fid) => {85 AssetMetadatas::<T>::get(AssetIds::ForeignAssetId(fid))86 .map(|x| x.minimal_balance)87 .unwrap_or_else(Zero::zero)88 }89 }90 }9192 fn balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {93 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible balance");94 match asset {95 AssetIds::NativeAssetId(NativeCurrency::Here) => {96 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::balance(who).into()97 }98 AssetIds::NativeAssetId(NativeCurrency::Parent) => {99 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::balance(100 AssetIds::NativeAssetId(NativeCurrency::Parent),101 who,102 )103 .into()104 }105 AssetIds::ForeignAssetId(fid) => {106 let target_collection_id = match <AssetBinding<T>>::get(fid) {107 Some(v) => v,108 None => return Zero::zero(),109 };110 let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {111 Ok(v) => v,112 Err(_) => return Zero::zero(),113 };114 let collection = FungibleHandle::cast(collection_handle);115 Self::Balance::try_from(116 collection.balance(T::CrossAccountId::from_sub(who.clone()), TokenId(0)),117 )118 .unwrap_or(Zero::zero())119 }120 }121 }122123 fn total_balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {124 Self::balance(asset, who)125 }126127 fn reducible_balance(128 asset: Self::AssetId,129 who: &<T as SystemConfig>::AccountId,130 preservation: Preservation,131 fortitude: Fortitude,132 ) -> Self::Balance {133 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible reducible_balance");134135 match asset {136 AssetIds::NativeAssetId(NativeCurrency::Here) => {137 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::reducible_balance(138 who,139 preservation,140 fortitude,141 )142 .into()143 }144 AssetIds::NativeAssetId(NativeCurrency::Parent) => {145 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::reducible_balance(146 AssetIds::NativeAssetId(NativeCurrency::Parent),147 who,148 preservation,149 fortitude,150 )151 .into()152 }153 _ => Self::balance(asset, who),154 }155 }156157 fn can_deposit(158 asset: Self::AssetId,159 who: &<T as SystemConfig>::AccountId,160 amount: Self::Balance,161 provenance: Provenance,162 ) -> DepositConsequence {163 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_deposit");164165 match asset {166 AssetIds::NativeAssetId(NativeCurrency::Here) => {167 <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_deposit(168 who,169 amount.into(),170 provenance,171 )172 }173 AssetIds::NativeAssetId(NativeCurrency::Parent) => {174 <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_deposit(175 AssetIds::NativeAssetId(NativeCurrency::Parent),176 who,177 amount.into(),178 provenance,179 )180 }181 _ => {182 if amount.is_zero() {183 return DepositConsequence::Success;184 }185186 let extential_deposit_value = T::ExistentialDeposit::get();187 let ed_value: u128 = match extential_deposit_value.try_into() {188 Ok(val) => val,189 Err(_) => return DepositConsequence::CannotCreate,190 };191 let extential_deposit: Self::Balance = match ed_value.try_into() {192 Ok(val) => val,193 Err(_) => return DepositConsequence::CannotCreate,194 };195196 let new_total_balance = match Self::balance(asset, who).checked_add(&amount) {197 Some(x) => x,198 None => return DepositConsequence::Overflow,199 };200201 if new_total_balance < extential_deposit {202 return DepositConsequence::BelowMinimum;203 }204205 DepositConsequence::Success206 }207 }208 }209210 fn can_withdraw(211 asset: Self::AssetId,212 who: &<T as SystemConfig>::AccountId,213 amount: Self::Balance,214 ) -> WithdrawConsequence<Self::Balance> {215 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_withdraw");216 let value: u128 = match amount.try_into() {217 Ok(val) => val,218 Err(_) => return WithdrawConsequence::UnknownAsset,219 };220221 match asset {222 AssetIds::NativeAssetId(NativeCurrency::Here) => {223 let this_amount: <T as pallet_balances::Config>::Balance = match value.try_into() {224 Ok(val) => val,225 Err(_) => {226 return WithdrawConsequence::UnknownAsset;227 }228 };229 match <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_withdraw(230 who,231 this_amount,232 ) {233 WithdrawConsequence::BalanceLow => WithdrawConsequence::BalanceLow,234 WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,235 WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,236 WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,237 WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,238 WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,239 WithdrawConsequence::Success => WithdrawConsequence::Success,240 _ => WithdrawConsequence::BalanceLow,241 }242 }243 AssetIds::NativeAssetId(NativeCurrency::Parent) => {244 let parent_amount: <T as orml_tokens::Config>::Balance = match value.try_into() {245 Ok(val) => val,246 Err(_) => {247 return WithdrawConsequence::UnknownAsset;248 }249 };250 match <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_withdraw(251 AssetIds::NativeAssetId(NativeCurrency::Parent),252 who,253 parent_amount,254 ) {255 WithdrawConsequence::BalanceLow => WithdrawConsequence::BalanceLow,256 WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,257 WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,258 WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,259 WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,260 WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,261 WithdrawConsequence::Success => WithdrawConsequence::Success,262 _ => WithdrawConsequence::BalanceLow,263 }264 }265 _ => match Self::balance(asset, who).checked_sub(&amount) {266 Some(_) => WithdrawConsequence::Success,267 None => WithdrawConsequence::BalanceLow,268 },269 }270 }271272 fn asset_exists(asset: AssetIds) -> bool {273 match asset {274 AssetIds::NativeAssetId(_) => true,275 AssetIds::ForeignAssetId(fid) => <AssetBinding<T>>::contains_key(fid),276 }277 }278}279280impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T>281where282 T: orml_tokens::Config<CurrencyId = AssetIds>,283 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,284 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,285 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,286 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,287 u128: From<BalanceOf<T>>,288{289 fn mint_into(290 asset: Self::AssetId,291 who: &<T as SystemConfig>::AccountId,292 amount: Self::Balance,293 ) -> Result<BalanceOf<T>, DispatchError> {294 //Self::do_mint(asset, who, amount, None)295 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible mint_into {:?}", asset);296297 match asset {298 AssetIds::NativeAssetId(NativeCurrency::Here) => {299 <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::mint_into(300 who,301 amount.into(),302 )303 .map(Into::into)304 }305 AssetIds::NativeAssetId(NativeCurrency::Parent) => {306 <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::mint_into(307 AssetIds::NativeAssetId(NativeCurrency::Parent),308 who,309 amount.into(),310 )311 .map(Into::into)312 }313 AssetIds::ForeignAssetId(fid) => {314 let target_collection_id = match <AssetBinding<T>>::get(fid) {315 Some(v) => v,316 None => {317 return Err(DispatchError::Other(318 "Associated collection not found for asset",319 ))320 }321 };322 let collection =323 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);324 let account = T::CrossAccountId::from_sub(who.clone());325326 let amount_data: pallet_fungible::CreateItemData<T> =327 (account.clone(), amount.into());328329 pallet_fungible::Pallet::<T>::create_item_foreign(330 &collection,331 &account,332 amount_data,333 &Value::new(0),334 )?;335336 Ok(amount)337 }338 }339 }340341 fn burn_from(342 asset: Self::AssetId,343 who: &<T as SystemConfig>::AccountId,344 amount: Self::Balance,345 precision: Precision,346 fortitude: Fortitude,347 ) -> Result<Self::Balance, DispatchError> {348 // let f = DebitFlags { keep_alive: false, best_effort: false };349 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible burn_from");350351 match asset {352 AssetIds::NativeAssetId(NativeCurrency::Here) => {353 <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::burn_from(354 who,355 amount.into(),356 precision,357 fortitude,358 )359 .map(Into::into)360 }361 AssetIds::NativeAssetId(NativeCurrency::Parent) => {362 <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::burn_from(363 AssetIds::NativeAssetId(NativeCurrency::Parent),364 who,365 amount.into(),366 precision,367 fortitude,368 )369 .map(Into::into)370 }371 AssetIds::ForeignAssetId(fid) => {372 let target_collection_id = match <AssetBinding<T>>::get(fid) {373 Some(v) => v,374 None => {375 return Err(DispatchError::Other(376 "Associated collection not found for asset",377 ))378 }379 };380 let collection =381 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);382 pallet_fungible::Pallet::<T>::burn_foreign(383 &collection,384 &T::CrossAccountId::from_sub(who.clone()),385 amount.into(),386 )?;387388 Ok(amount)389 }390 }391 }392393 fn transfer(394 asset: Self::AssetId,395 source: &<T as SystemConfig>::AccountId,396 dest: &<T as SystemConfig>::AccountId,397 amount: Self::Balance,398 preservation: Preservation,399 ) -> Result<Self::Balance, DispatchError> {400 // let f = TransferFlags { keep_alive, best_effort: false, burn_dust: false };401 log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible transfer");402403 match asset {404 AssetIds::NativeAssetId(NativeCurrency::Here) => {405 match <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::transfer(406 source,407 dest,408 amount.into(),409 preservation,410 ) {411 Ok(_) => Ok(amount),412 Err(_) => Err(DispatchError::Other(413 "Bad amount to relay chain value conversion",414 )),415 }416 }417 AssetIds::NativeAssetId(NativeCurrency::Parent) => {418 match <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::transfer(419 AssetIds::NativeAssetId(NativeCurrency::Parent),420 source,421 dest,422 amount.into(),423 preservation,424 ) {425 Ok(_) => Ok(amount),426 Err(e) => Err(e),427 }428 }429 AssetIds::ForeignAssetId(fid) => {430 let target_collection_id = match <AssetBinding<T>>::get(fid) {431 Some(v) => v,432 None => {433 return Err(DispatchError::Other(434 "Associated collection not found for asset",435 ))436 }437 };438 let collection =439 FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);440441 pallet_fungible::Pallet::<T>::transfer(442 &collection,443 &T::CrossAccountId::from_sub(source.clone()),444 &T::CrossAccountId::from_sub(dest.clone()),445 amount.into(),446 &Value::new(0),447 )448 .map_err(|e| e.error)?;449450 Ok(amount)451 }452 }453 }454}455456#[cfg(not(debug_assertions))]457extern "C" {458 // This function does not exists, thus compilation will fail, if its call is459 // not optimized away, which is only possible if it's not called at all.460 //461 // not(debug_assertions) is used to ensure compiler is dropping unused functions, as462 // this option is enabled in release by defailt463 //464 // FIXME: maybe use build.rs, to ensure it will fail even in release with debug_assertions465 // enabled?466 fn unbalanced_fungible_is_called();467}468macro_rules! ensure_balanced {469 () => {{470 #[cfg(debug_assertions)]471 panic!("unbalanced fungible methods should not be used");472 #[cfg(not(debug_assertions))]473 {474 unsafe { unbalanced_fungible_is_called() };475 unreachable!();476 }477 }};478}479480impl<T: Config> fungibles::Unbalanced<<T as SystemConfig>::AccountId> for Pallet<T>481where482 T: orml_tokens::Config<CurrencyId = AssetIds>,483 BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,484 BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,485 <T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,486 <T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,487 u128: From<BalanceOf<T>>,488{489 fn handle_dust(_dust: fungibles::Dust<<T as SystemConfig>::AccountId, Self>) {490 ensure_balanced!();491 }492 fn write_balance(493 _asset: Self::AssetId,494 _who: &<T as SystemConfig>::AccountId,495 _amount: Self::Balance,496 ) -> Result<Option<Self::Balance>, DispatchError> {497 ensure_balanced!();498 }499 fn set_total_issuance(_asset: Self::AssetId, _amount: Self::Balance) {500 ensure_balanced!();501 }502}pallets/foreign-assets/src/lib.rsdiffbeforeafterboth--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -161,7 +161,7 @@
fn get_currency_id(multi_location: MultiLocation) -> Option<CurrencyId> {
log::trace!(target: "fassets::get_currency_id", "call");
- Pallet::<T>::location_to_currency_ids(multi_location).map(|id| AssetIds::ForeignAssetId(id))
+ Pallet::<T>::location_to_currency_ids(multi_location).map(AssetIds::ForeignAssetId)
}
}
@@ -378,7 +378,7 @@
foreign_asset_id,
|maybe_location| -> DispatchResult {
ensure!(maybe_location.is_none(), Error::<T>::MultiLocationExisted);
- *maybe_location = Some(location.clone());
+ *maybe_location = Some(*location);
AssetMetadatas::<T>::try_mutate(
AssetIds::ForeignAssetId(foreign_asset_id),
@@ -422,7 +422,7 @@
// modify location
if location != old_multi_locations {
- LocationToCurrencyIds::<T>::remove(old_multi_locations.clone());
+ LocationToCurrencyIds::<T>::remove(*old_multi_locations);
LocationToCurrencyIds::<T>::try_mutate(
location,
|maybe_currency_ids| -> DispatchResult {
@@ -437,7 +437,7 @@
)?;
}
*maybe_asset_metadatas = Some(metadata.clone());
- *old_multi_locations = location.clone();
+ *old_multi_locations = *location;
Ok(())
},
)
pallets/identity/src/types.rsdiffbeforeafterboth--- a/pallets/identity/src/types.rs
+++ b/pallets/identity/src/types.rs
@@ -104,7 +104,7 @@
Data::Raw(ref x) => {
let l = x.len().min(32);
let mut r = vec![l as u8 + 1; l + 1];
- r[1..].copy_from_slice(&x[..l as usize]);
+ r[1..].copy_from_slice(&x[..l]);
r
}
Data::BlakeTwo256(ref h) => once(34u8).chain(h.iter().cloned()).collect(),
@@ -287,7 +287,7 @@
fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
let field = u64::decode(input)?;
Ok(Self(
- <BitFlags<IdentityField>>::from_bits(field as u64).map_err(|_| "invalid value")?,
+ <BitFlags<IdentityField>>::from_bits(field).map_err(|_| "invalid value")?,
))
}
}
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -20,6 +20,8 @@
//! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.
extern crate alloc;
+
+use alloc::string::ToString;
use core::{
char::{REPLACEMENT_CHARACTER, decode_utf16},
convert::TryInto,
@@ -356,8 +358,7 @@
.transpose()
.map_err(|e| {
Error::Revert(alloc::format!(
- "Can not convert value \"baseURI\" to string with error \"{}\"",
- e
+ "Can not convert value \"baseURI\" to string with error \"{e}\""
))
})?;
@@ -675,7 +676,7 @@
.try_into()
.map_err(|_| "token uri is too long")?,
})
- .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
+ .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
<Pallet<T>>::create_item(
self,
@@ -717,7 +718,7 @@
.map(Clone::clone)
.ok_or_else(|| {
let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
- Error::Revert(alloc::format!("No permission for key {}", key))
+ Error::Revert(alloc::format!("No permission for key {key}"))
})?;
Ok(a)
}
@@ -752,14 +753,14 @@
/// @param tokenId Id for the token.
#[solidity(hide)]
fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
- Self::owner_of_cross(&self, token_id)
+ Self::owner_of_cross(self, token_id)
}
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
fn owner_of_cross(&self, token_id: U256) -> Result<eth::CrossAddress> {
- Self::token_owner(&self, token_id.try_into()?)
+ Self::token_owner(self, token_id.try_into()?)
.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.map_err(|_| Error::Revert("token not found".into()))
}
@@ -789,7 +790,7 @@
.collect::<Result<Vec<_>>>()?;
<Self as CommonCollectionOperations<T>>::token_properties(
- &self,
+ self,
token_id.try_into()?,
if keys.is_empty() { None } else { Some(keys) },
)
@@ -1021,7 +1022,7 @@
.try_into()
.map_err(|_| "token uri is too long")?,
})
- .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
+ .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
data.push(CreateItemData::<T> {
properties,
@@ -1056,7 +1057,7 @@
.map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?
.try_into()
- .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+ .map_err(|_| Error::Revert("too many properties".to_string()))?;
let caller = T::CrossAccountId::from_eth(caller);
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -166,10 +166,7 @@
#[pallet::config]
pub trait Config:
- frame_system::Config
- + pallet_common::Config
- + pallet_structure::Config
- + pallet_evm::Config
+ frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config
{
type WeightInfo: WeightInfo;
}
@@ -860,13 +857,7 @@
<PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);
- <TokenData<T>>::insert(
- (collection.id, token),
- ItemData {
- owner: to.clone(),
- ..token_data
- },
- );
+ <TokenData<T>>::insert((collection.id, token), ItemData { owner: to.clone() });
if let Some(balance_to) = balance_to {
// from != to
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -21,6 +21,7 @@
extern crate alloc;
+use alloc::string::ToString;
use core::{
char::{REPLACEMENT_CHARACTER, decode_utf16},
convert::TryInto,
@@ -353,8 +354,7 @@
.transpose()
.map_err(|e| {
Error::Revert(alloc::format!(
- "Can not convert value \"baseURI\" to string with error \"{}\"",
- e
+ "Can not convert value \"baseURI\" to string with error \"{e}\""
))
})?;
@@ -482,8 +482,8 @@
.recorder
.weight_calls_budget(<StructureWeight<T>>::find_parent());
- let balance = balance(&self, token, &from)?;
- ensure_single_owner(&self, token, balance)?;
+ let balance = balance(self, token, &from)?;
+ ensure_single_owner(self, token, balance)?;
<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)
.map_err(dispatch_to_evm::<T>)?;
@@ -575,8 +575,8 @@
let caller = T::CrossAccountId::from_eth(caller);
let token = token_id.try_into()?;
- let balance = balance(&self, token, &caller)?;
- ensure_single_owner(&self, token, balance)?;
+ let balance = balance(self, token, &caller)?;
+ ensure_single_owner(self, token, balance)?;
<Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;
Ok(())
@@ -622,7 +622,7 @@
return Err("item id should be next".into());
}
- let users = [(to.clone(), 1)]
+ let users = [(to, 1)]
.into_iter()
.collect::<BTreeMap<_, _>>()
.try_into()
@@ -706,9 +706,9 @@
.try_into()
.map_err(|_| "token uri is too long")?,
})
- .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
+ .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
- let users = [(to.clone(), 1)]
+ let users = [(to, 1)]
.into_iter()
.collect::<BTreeMap<_, _>>()
.try_into()
@@ -750,7 +750,7 @@
.map(Clone::clone)
.ok_or_else(|| {
let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
- Error::Revert(alloc::format!("No permission for key {}", key))
+ Error::Revert(alloc::format!("No permission for key {key}"))
})?;
Ok(a)
}
@@ -785,14 +785,14 @@
/// @param tokenId Id for the token.
#[solidity(hide)]
fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
- Self::owner_of_cross(&self, token_id)
+ Self::owner_of_cross(self, token_id)
}
/// Returns the owner (in cross format) of the token.
///
/// @param tokenId Id for the token.
fn owner_of_cross(&self, token_id: U256) -> Result<eth::CrossAddress> {
- Self::token_owner(&self, token_id.try_into()?)
+ Self::token_owner(self, token_id.try_into()?)
.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
.or_else(|err| match err {
TokenOwnerError::NotFound => Err(Error::Revert("token not found".into())),
@@ -827,7 +827,7 @@
.collect::<Result<Vec<_>>>()?;
<Self as CommonCollectionOperations<T>>::token_properties(
- &self,
+ self,
token_id.try_into()?,
if keys.is_empty() { None } else { Some(keys) },
)
@@ -1004,7 +1004,7 @@
}
expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;
}
- let users = [(to.clone(), 1)]
+ let users = [(to, 1)]
.into_iter()
.collect::<BTreeMap<_, _>>()
.try_into()
@@ -1046,7 +1046,7 @@
.weight_calls_budget(<StructureWeight<T>>::find_parent());
let mut data = Vec::with_capacity(tokens.len());
- let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]
+ let users: BoundedBTreeMap<_, _, _> = [(to, 1)]
.into_iter()
.collect::<BTreeMap<_, _>>()
.try_into()
@@ -1067,7 +1067,7 @@
.try_into()
.map_err(|_| "token uri is too long")?,
})
- .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
+ .map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
let create_item_data = CreateItemData::<T> {
users: users.clone(),
@@ -1103,7 +1103,7 @@
.map(eth::Property::try_into)
.collect::<Result<Vec<_>>>()?
.try_into()
- .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+ .map_err(|_| Error::Revert("too many properties".to_string()))?;
let caller = T::CrossAccountId::from_eth(caller);
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -1124,7 +1124,7 @@
if collection.ignores_token_restrictions(spender) {
return Ok(Self::compute_allowance_decrease(
- collection, token, from, &spender, amount,
+ collection, token, from, spender, amount,
));
}
@@ -1143,7 +1143,7 @@
return Ok(None);
}
- let allowance = Self::compute_allowance_decrease(collection, token, from, &spender, amount);
+ let allowance = Self::compute_allowance_decrease(collection, token, from, spender, amount);
if allowance.is_some() {
return Ok(allowance);
}
pallets/scheduler-v2/src/lib.rsdiffbeforeafterboth--- a/pallets/scheduler-v2/src/lib.rs
+++ b/pallets/scheduler-v2/src/lib.rs
@@ -969,7 +969,7 @@
call: ScheduledCall<T>,
) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
// ensure id it is unique
- if Lookup::<T>::contains_key(&id) {
+ if Lookup::<T>::contains_key(id) {
return Err(Error::<T>::FailedToSchedule.into());
}
pallets/structure/src/lib.rsdiffbeforeafterboth--- a/pallets/structure/src/lib.rs
+++ b/pallets/structure/src/lib.rs
@@ -280,7 +280,7 @@
) -> DispatchResultWithPostInfo {
let dispatch = T::CollectionDispatch::dispatch(collection)?;
let dispatch = dispatch.as_dyn();
- dispatch.burn_item_recursively(from.clone(), token, self_budget, breadth_budget)
+ dispatch.burn_item_recursively(from, token, self_budget, breadth_budget)
}
/// Check if `token` indirectly owned by `user`
@@ -396,7 +396,7 @@
account: &T::CrossAccountId,
action: impl FnOnce(&dyn CommonCollectionOperations<T>, TokenId) -> DispatchResult,
) -> DispatchResult {
- if is_collection(&account.as_eth()) {
+ if is_collection(account.as_eth()) {
fail!(<Error<T>>::CantNestTokenUnderCollection);
}
let Some((collection, token)) = T::CrossTokenAddressMapping::address_to_token(account) else {
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -113,13 +113,9 @@
let collection_helpers_address =
T::CrossAccountId::from_eth(<T as pallet_common::Config>::ContractAddress::get());
- let collection_id = T::CollectionDispatch::create(
- caller.clone(),
- collection_helpers_address,
- data,
- Default::default(),
- )
- .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+ let collection_id =
+ T::CollectionDispatch::create(caller, collection_helpers_address, data, Default::default())
+ .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
let address = pallet_common::eth::collection_id_to_address(collection_id);
Ok(address)
}
@@ -132,8 +128,7 @@
.expect("Collection creation price should be convertible to u128");
if value != creation_price {
return Err(format!(
- "Sent amount not equals to collection creation price ({0})",
- creation_price
+ "Sent amount not equals to collection creation price ({creation_price})",
)
.into());
}
@@ -383,8 +378,7 @@
map_eth_to_id(&collection_address)
.map(|id| id.0)
.ok_or(Error::Revert(format!(
- "failed to convert address {} into collectionId.",
- collection_address
+ "failed to convert address {collection_address} into collectionId."
)))
}
}
@@ -422,5 +416,5 @@
generate_stubgen!(collection_helper_iface, CollectionHelpersCall<()>, false);
fn error_field_too_long(feild: &str, bound: usize) -> Error {
- Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))
+ Error::Revert(format!("{feild} is too long. Max length is {bound}."))
}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -507,7 +507,7 @@
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let new_owner = T::CrossAccountId::from_sub(new_owner);
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
- target_collection.change_owner(sender, new_owner.clone())
+ target_collection.change_owner(sender, new_owner)
}
/// Add an admin to a collection.
@@ -667,7 +667,7 @@
/// * `owner`: Address of the initial owner of the item.
/// * `data`: Token data describing the item to store on chain.
#[pallet::call_index(11)]
- #[pallet::weight(T::CommonWeightInfo::create_item(&data))]
+ #[pallet::weight(T::CommonWeightInfo::create_item(data))]
pub fn create_item(
origin: OriginFor<T>,
collection_id: CollectionId,
@@ -701,7 +701,7 @@
/// * `owner`: Address of the initial owner of the tokens.
/// * `items_data`: Vector of data describing each item to be created.
#[pallet::call_index(12)]
- #[pallet::weight(T::CommonWeightInfo::create_multiple_items(&items_data))]
+ #[pallet::weight(T::CommonWeightInfo::create_multiple_items(items_data))]
pub fn create_multiple_items(
origin: OriginFor<T>,
collection_id: CollectionId,
@@ -889,7 +889,7 @@
/// * `collection_id`: ID of the collection to which the tokens would belong.
/// * `data`: Explicit item creation data.
#[pallet::call_index(18)]
- #[pallet::weight(T::CommonWeightInfo::create_multiple_items_ex(&data))]
+ #[pallet::weight(T::CommonWeightInfo::create_multiple_items_ex(data))]
pub fn create_multiple_items_ex(
origin: OriginFor<T>,
collection_id: CollectionId,
@@ -1313,7 +1313,7 @@
collection_id: CollectionId,
) -> DispatchResult {
let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
- target_collection.force_set_sponsor(sponsor.clone())
+ target_collection.force_set_sponsor(sponsor)
}
/// Force remove `sponsor` for `collection`.
primitives/data-structs/src/bounded.rsdiffbeforeafterboth--- a/primitives/data-structs/src/bounded.rs
+++ b/primitives/data-structs/src/bounded.rs
@@ -63,7 +63,7 @@
V: fmt::Debug,
{
use core::fmt::Debug;
- (&v as &Vec<V>).fmt(f)
+ (v as &Vec<V>).fmt(f)
}
#[cfg(feature = "serde1")]
@@ -114,7 +114,7 @@
V: fmt::Debug,
{
use core::fmt::Debug;
- (&v as &BTreeMap<K, V>).fmt(f)
+ (v as &BTreeMap<K, V>).fmt(f)
}
#[cfg(feature = "serde1")]
@@ -157,5 +157,5 @@
K: fmt::Debug + Ord,
{
use core::fmt::Debug;
- (&v as &BTreeSet<K>).fmt(f)
+ (v as &BTreeSet<K>).fmt(f)
}
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -536,7 +536,7 @@
type Target = Vec<u8>;
fn deref(&self) -> &Self::Target {
- return &self.0;
+ &self.0
}
}
@@ -816,6 +816,11 @@
Self(Default::default())
}
}
+impl Default for OwnerRestrictedSet {
+ fn default() -> Self {
+ Self::new()
+ }
+}
impl core::ops::Deref for OwnerRestrictedSet {
type Target = OwnerRestrictedSetInner;
fn deref(&self) -> &Self::Target {
@@ -1098,9 +1103,9 @@
pub value: PropertyValue,
}
-impl Into<(PropertyKey, PropertyValue)> for Property {
- fn into(self) -> (PropertyKey, PropertyValue) {
- (self.key, self.value)
+impl From<Property> for (PropertyKey, PropertyValue) {
+ fn from(value: Property) -> Self {
+ (value.key, value.value)
}
}
@@ -1116,9 +1121,9 @@
pub permission: PropertyPermission,
}
-impl Into<(PropertyKey, PropertyPermission)> for PropertyKeyPermission {
- fn into(self) -> (PropertyKey, PropertyPermission) {
- (self.key, self.permission)
+impl From<PropertyKeyPermission> for (PropertyKey, PropertyPermission) {
+ fn from(value: PropertyKeyPermission) -> Self {
+ (value.key, value.permission)
}
}
@@ -1415,7 +1420,7 @@
value: Self::Value,
) -> Result<Option<Self::Value>, PropertiesError> {
let key_size = scoped_slice_size(scope, &key);
- let value_size = slice_size(&value) as u32;
+ let value_size = slice_size(&value);
if self.consumed_space + value_size + key_size > S && !cfg!(feature = "runtime-benchmarks")
{
@@ -1425,7 +1430,7 @@
let old_value = self.map.try_scoped_set(scope, key, value)?;
if let Some(old_value) = old_value.as_ref() {
- let old_value_size = slice_size(&old_value);
+ let old_value_size = slice_size(old_value);
self.consumed_space = self.consumed_space.saturating_sub(old_value_size) + value_size;
} else {
self.consumed_space += key_size + value_size;
runtime/common/config/xcm/foreignassets.rsdiffbeforeafterboth--- a/runtime/common/config/xcm/foreignassets.rs
+++ b/runtime/common/config/xcm/foreignassets.rs
@@ -65,7 +65,7 @@
return ConvertAssetId::convert_ref(AssetIds::NativeAssetId(NativeCurrency::Here));
}
- match XcmForeignAssetIdMapping::<Runtime>::get_currency_id(id.clone()) {
+ match XcmForeignAssetIdMapping::<Runtime>::get_currency_id(*id) {
Some(AssetIds::ForeignAssetId(foreign_asset_id)) => {
ConvertAssetId::convert_ref(AssetIds::ForeignAssetId(foreign_asset_id))
}
@@ -206,9 +206,7 @@
return Some(AssetIds::NativeAssetId(NativeCurrency::Parent));
}
- if let Some(currency_id) =
- XcmForeignAssetIdMapping::<Runtime>::get_currency_id(location.clone())
- {
+ if let Some(currency_id) = XcmForeignAssetIdMapping::<Runtime>::get_currency_id(location) {
return Some(currency_id);
}
runtime/common/ethereum/precompiles/mod.rsdiffbeforeafterboth--- a/runtime/common/ethereum/precompiles/mod.rs
+++ b/runtime/common/ethereum/precompiles/mod.rs
@@ -37,6 +37,16 @@
[hash(1), hash(20482)]
}
}
+
+impl<R> Default for UniquePrecompiles<R>
+where
+ R: pallet_evm::Config,
+{
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
impl<R> PrecompileSet for UniquePrecompiles<R>
where
R: pallet_evm::Config,
runtime/common/ethereum/precompiles/sr25519.rsdiffbeforeafterboth--- a/runtime/common/ethereum/precompiles/sr25519.rs
+++ b/runtime/common/ethereum/precompiles/sr25519.rs
@@ -64,7 +64,7 @@
// Parse arguments
let public: sr25519::Public =
- sr25519::Public::unchecked_from(input.read::<H256>(gasometer)?).into();
+ sr25519::Public::unchecked_from(input.read::<H256>(gasometer)?);
let signature_bytes: Vec<u8> = input.read::<Bytes>(gasometer)?.into();
let message: Vec<u8> = input.read::<Bytes>(gasometer)?.into();
runtime/common/ethereum/precompiles/utils/data.rsdiffbeforeafterboth--- a/runtime/common/ethereum/precompiles/utils/data.rs
+++ b/runtime/common/ethereum/precompiles/utils/data.rs
@@ -60,7 +60,7 @@
}
impl Into<Vec<u8>> for Bytes {
- fn into(self: Self) -> Vec<u8> {
+ fn into(self) -> Vec<u8> {
self.0
}
}
runtime/common/ethereum/precompiles/utils/mod.rsdiffbeforeafterboth--- a/runtime/common/ethereum/precompiles/utils/mod.rs
+++ b/runtime/common/ethereum/precompiles/utils/mod.rs
@@ -73,7 +73,6 @@
}
}
- #[must_use]
/// Check that a function call is compatible with the context it is
/// called into.
pub fn check_function_modifier(
runtime/common/ethereum/sponsoring.rsdiffbeforeafterboth--- a/runtime/common/ethereum/sponsoring.rs
+++ b/runtime/common/ethereum/sponsoring.rs
@@ -78,7 +78,7 @@
let token_id: TokenId = token_id.try_into().ok()?;
withdraw_set_token_property::<T>(
&collection,
- &who,
+ who,
&token_id,
key.len() + value.len(),
)
@@ -88,7 +88,7 @@
ERC721UniqueExtensionsCall::Transfer { token_id, .. },
) => {
let token_id: TokenId = token_id.try_into().ok()?;
- withdraw_transfer::<T>(&collection, &who, &token_id).map(|()| sponsor)
+ withdraw_transfer::<T>(&collection, who, &token_id).map(|()| sponsor)
}
UniqueNFTCall::ERC721UniqueMintable(
ERC721UniqueMintableCall::Mint { .. }
@@ -97,7 +97,7 @@
| ERC721UniqueMintableCall::MintWithTokenUriCheckId { .. },
) => withdraw_create_item::<T>(
&collection,
- &who,
+ who,
&CreateItemData::NFT(CreateNftData::default()),
)
.map(|()| sponsor),
runtime/common/ethereum/sponsoring/refungible.rsdiffbeforeafterboth--- a/runtime/common/ethereum/sponsoring/refungible.rs
+++ b/runtime/common/ethereum/sponsoring/refungible.rs
@@ -16,7 +16,6 @@
//! Implements EVM sponsoring logic via TransactionValidityHack
-use core::convert::TryInto;
use pallet_common::CollectionHandle;
use pallet_evm::account::CrossAccountId;
use pallet_fungible::Config as FungibleConfig;
@@ -95,7 +94,7 @@
..
} => {
let token_id = TokenId::try_from(token_id).ok()?;
- withdraw_set_token_property::<T>(&collection, &who, &token_id, key.len() + value.len())
+ withdraw_set_token_property::<T>(&collection, who, &token_id, key.len() + value.len())
}
}
}
@@ -242,7 +241,7 @@
MintCross { .. } => withdraw_create_item::<T>(
&collection,
- &who,
+ who,
&CreateItemData::NFT(CreateNftData::default()),
),
@@ -250,7 +249,7 @@
| TransferFromCross { token_id, .. }
| Transfer { token_id, .. } => {
let token_id = TokenId::try_from(token_id).ok()?;
- withdraw_transfer::<T>(&collection, &who, &token_id)
+ withdraw_transfer::<T>(&collection, who, &token_id)
}
}
}
@@ -275,7 +274,7 @@
| MintWithTokenUri { .. }
| MintWithTokenUriCheckId { .. } => withdraw_create_item::<T>(
&collection,
- &who,
+ who,
&CreateItemData::NFT(CreateNftData::default()),
),
}
@@ -311,18 +310,15 @@
Transfer { .. } => {
let RefungibleTokenHandle(handle, token_id) = token;
- let token_id = token_id.try_into().ok()?;
- withdraw_transfer::<T>(&handle, &who, &token_id)
+ withdraw_transfer::<T>(&handle, who, &token_id)
}
TransferFrom { from, .. } => {
let RefungibleTokenHandle(handle, token_id) = token;
- let token_id = token_id.try_into().ok()?;
let from = T::CrossAccountId::from_eth(from);
withdraw_transfer::<T>(&handle, &from, &token_id)
}
Approve { .. } => {
let RefungibleTokenHandle(handle, token_id) = token;
- let token_id = token_id.try_into().ok()?;
withdraw_approve::<T>(&handle, who.as_sub(), &token_id)
}
}
@@ -351,13 +347,11 @@
TransferCross { .. } | TransferFromCross { .. } => {
let RefungibleTokenHandle(handle, token_id) = token;
- let token_id = token_id.try_into().ok()?;
- withdraw_transfer::<T>(&handle, &who, &token_id)
+ withdraw_transfer::<T>(&handle, who, &token_id)
}
ApproveCross { .. } => {
let RefungibleTokenHandle(handle, token_id) = token;
- let token_id = token_id.try_into().ok()?;
withdraw_approve::<T>(&handle, who.as_sub(), &token_id)
}
}
runtime/common/mod.rsdiffbeforeafterboth--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -204,10 +204,7 @@
&[],
);
- let should_upgrade = match version {
- None => true,
- Some(_) => false,
- };
+ let should_upgrade = version.is_none();
if should_upgrade {
log::info!(
@@ -220,7 +217,7 @@
.cloned()
.filter_map(|authority_id| {
weight.saturating_accrue(<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 1));
- let vec = authority_id.clone().to_raw_vec();
+ let vec = authority_id.to_raw_vec();
let slice = vec.as_slice();
let array: Option<[u8; 32]> = match slice.try_into() {
Ok(a) => Some(a),
@@ -248,20 +245,20 @@
.into_iter()
.map(|(acc, aura)| {
(
- acc.clone(), // account id
- acc, // validator id
- SessionKeys { aura: aura.clone() }, // session keys
+ acc.clone(), // account id
+ acc, // validator id
+ SessionKeys { aura }, // session keys
)
})
.collect::<Vec<_>>();
- for (account, val, keys) in keys.iter().cloned() {
+ for (account, val, keys) in keys.iter() {
for id in <Runtime as pallet_session::Config>::Keys::key_ids() {
- <pallet_session::KeyOwner<Runtime>>::insert((*id, keys.get_raw(*id)), &val)
+ <pallet_session::KeyOwner<Runtime>>::insert((*id, keys.get_raw(*id)), val)
}
- <pallet_session::NextKeys<Runtime>>::insert(&val, &keys);
+ <pallet_session::NextKeys<Runtime>>::insert(val, keys);
// todo exercise caution, the following is taken from genesis
- if frame_system::Pallet::<Runtime>::inc_consumers_without_limit(&account)
+ if frame_system::Pallet::<Runtime>::inc_consumers_without_limit(account)
.is_err()
{
log::warn!(
@@ -271,7 +268,7 @@
// genesis) so it's really not a big deal and we assume that the user wants to
// do this since it's the only way a non-endowed account can contain a session
// key.
- frame_system::Pallet::<Runtime>::inc_providers(&account);
+ frame_system::Pallet::<Runtime>::inc_providers(account);
}
}
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -84,7 +84,7 @@
fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {
let budget = up_data_structs::budget::Value::new(10);
- Ok(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?)
+ <pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)
}
fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {
Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))
runtime/common/sponsoring.rsdiffbeforeafterboth--- a/runtime/common/sponsoring.rs
+++ b/runtime/common/sponsoring.rs
@@ -240,7 +240,7 @@
withdraw_set_token_property(
&collection,
&T::CrossAccountId::from_sub(who.clone()),
- &token_id,
+ token_id,
// No overflow may happen, as data larger than usize can't reach here
properties.iter().map(|p| p.key.len() + p.value.len()).sum(),
)
test-pallets/utils/src/lib.rsdiffbeforeafterboth--- a/test-pallets/utils/src/lib.rs
+++ b/test-pallets/utils/src/lib.rs
@@ -170,7 +170,7 @@
fn ensure_origin_and_enabled(origin: OriginFor<T>) -> DispatchResult {
ensure_signed(origin)?;
<Enabled<T>>::get()
- .then(|| ())
+ .then_some(())
.ok_or(<Error<T>>::TestPalletDisabled.into())
}
}