From b88274c6db1bd29ff28ab1354702bfc35a228bc8 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Wed, 28 Sep 2022 16:06:11 +0000 Subject: [PATCH] fix: cargo fmt --- --- a/crates/evm-coder/src/execution.rs +++ b/crates/evm-coder/src/execution.rs @@ -60,12 +60,16 @@ } impl From for DispatchInfo { fn from(weight: u64) -> Self { - Self { weight: Weight::from_ref_time(weight) } + Self { + weight: Weight::from_ref_time(weight), + } } } impl From<()> for DispatchInfo { fn from(_: ()) -> Self { - Self { weight: Weight::zero() } + Self { + weight: Weight::zero(), + } } } --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -327,7 +327,7 @@ Arc::new(RelayChainRpcInterface::new(rpc_client)) as Arc<_>, None, )) - }, + } None => build_inprocess_relay_chain( polkadot_config, parachain_config, --- a/pallets/common/src/lib.rs +++ b/pallets/common/src/lib.rs @@ -185,25 +185,21 @@ /// Consume gas for reading. pub fn consume_store_reads(&self, reads: u64) -> evm_coder::execution::Result<()> { self.recorder - .consume_gas(T::GasWeightMapping::weight_to_gas( - Weight::from_ref_time( - ::DbWeight::get() - .read - .saturating_mul(reads) - ), - )) + .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time( + ::DbWeight::get() + .read + .saturating_mul(reads), + ))) } /// Consume gas for writing. pub fn consume_store_writes(&self, writes: u64) -> evm_coder::execution::Result<()> { self.recorder - .consume_gas(T::GasWeightMapping::weight_to_gas( - Weight::from_ref_time( - ::DbWeight::get() - .write - .saturating_mul(writes) - ), - )) + .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time( + ::DbWeight::get() + .write + .saturating_mul(writes), + ))) } /// Consume gas for reading and writing. @@ -216,9 +212,9 @@ let reads = weight.read.saturating_mul(reads); let writes = weight.read.saturating_mul(writes); self.recorder - .consume_gas(T::GasWeightMapping::weight_to_gas( - Weight::from_ref_time(reads.saturating_add(writes)), - )) + .consume_gas(T::GasWeightMapping::weight_to_gas(Weight::from_ref_time( + reads.saturating_add(writes), + ))) } /// Save collection to storage. --- a/pallets/refungible/src/lib.rs +++ b/pallets/refungible/src/lib.rs @@ -99,9 +99,7 @@ use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm}; use pallet_evm_coder_substrate::WithRecorder; use pallet_common::{ - CommonCollectionOperations, - Error as CommonError, - eth::collection_id_to_address, + CommonCollectionOperations, Error as CommonError, eth::collection_id_to_address, Event as CommonEvent, Pallet as PalletCommon, }; use pallet_structure::Pallet as PalletStructure; @@ -110,10 +108,10 @@ use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome}; use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap}; use up_data_structs::{ - AccessMode, budget::Budget, CollectionId, CollectionFlags, - CollectionPropertiesVec, CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, - MAX_ITEMS_PER_BATCH, MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, - PropertyPermission, PropertyScope, PropertyValue, TokenId, TrySetProperty, + AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec, + CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH, + MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission, + PropertyScope, PropertyValue, TokenId, TrySetProperty, }; use frame_support::BoundedBTreeMap; use derivative::Derivative; --- a/runtime/common/config/xcm/nativeassets.rs +++ b/runtime/common/config/xcm/nativeassets.rs @@ -23,8 +23,7 @@ use xcm::latest::{ AssetId::{Concrete}, Fungibility::Fungible as XcmFungible, - MultiAsset, Error as XcmError, - Weight, + MultiAsset, Error as XcmError, Weight, }; use xcm_builder::{CurrencyAdapter, NativeAsset}; use xcm_executor::{ --- a/runtime/common/mod.rs +++ b/runtime/common/mod.rs @@ -39,10 +39,7 @@ #[cfg(feature = "std")] use sp_version::NativeVersion; -use crate::{ - Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsWithSystem, - InherentDataExt, -}; +use crate::{Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsWithSystem, InherentDataExt}; use up_common::types::{AccountId, BlockNumber}; #[macro_export] @@ -105,7 +102,7 @@ Block, frame_system::ChainContext, Runtime, - AllPalletsWithSystem + AllPalletsWithSystem, >; type NegativeImbalance = >::NegativeImbalance; --- a/runtime/opal/src/xcm_barrier.rs +++ b/runtime/opal/src/xcm_barrier.rs @@ -15,7 +15,10 @@ // along with Unique Network. If not, see . use frame_support::traits::Everything; -use xcm::{latest::{Xcm, Weight}, v1::MultiLocation}; +use xcm::{ + latest::{Xcm, Weight}, + v1::MultiLocation, +}; use xcm_builder::{AllowTopLevelPaidExecutionFrom, TakeWeightCredit}; use xcm_executor::traits::ShouldExecute; -- gitstuff