difftreelog
style fix formatting
in: master
4 files changed
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -528,7 +528,7 @@
|r: sc_service::Result<
up_data_structs::TokenDataVersion1<CrossAccountId>,
sp_runtime::DispatchError,
- >| r.and_then(|value| Ok(value.into())),
+ >| r.map(|value| value.into()),
)
.or_else(|_| {
Ok(api
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -297,7 +297,7 @@
default_runtime,
// Sudo account
get_account_id_from_seed::<sr25519::Public>("Alice"),
- vec![
+ [
(
get_account_id_from_seed::<sr25519::Public>("Alice"),
get_from_seed::<AuraId>("Alice"),
@@ -371,7 +371,7 @@
default_runtime,
// Sudo account
get_account_id_from_seed::<sr25519::Public>("Alice"),
- vec![
+ [
(
get_account_id_from_seed::<sr25519::Public>("Alice"),
get_from_seed::<AuraId>("Alice"),
runtime/common/config/pallets/mod.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/>.1617use alloc::string::{String, ToString};18use frame_support::parameter_types;19use sp_runtime::traits::AccountIdConversion;20use crate::{21 runtime_common::{22 dispatch::CollectionDispatchT,23 config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},24 weights::CommonWeights,25 RelayChainBlockNumberProvider,26 },27 Runtime, RuntimeEvent, RuntimeCall, RUNTIME_NAME, TOKEN_SYMBOL, DECIMALS,28 Balances,29};30use frame_support::traits::{ConstU32, ConstU64, Currency};31use up_common::{32 types::{AccountId, Balance, BlockNumber},33 constants::*,34};35use up_data_structs::{36 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},37};38use sp_arithmetic::Perbill;3940#[cfg(feature = "unique-scheduler")]41pub mod scheduler;4243#[cfg(feature = "foreign-assets")]44pub mod foreign_asset;4546#[cfg(feature = "app-promotion")]47pub mod app_promotion;4849#[cfg(feature = "collator-selection")]50pub mod collator_selection;5152#[cfg(feature = "preimage")]53pub mod preimage;5455#[cfg(feature = "governance")]56pub mod governance;5758parameter_types! {59 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;60 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();61}6263impl pallet_common::Config for Runtime {64 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;65 type RuntimeEvent = RuntimeEvent;66 type Currency = Balances;67 type CollectionCreationPrice = CollectionCreationPrice;68 type TreasuryAccountId = TreasuryAccountId;69 type CollectionDispatch = CollectionDispatchT<Self>;7071 type EvmTokenAddressMapping = EvmTokenAddressMapping;72 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;73 type ContractAddress = EvmCollectionHelpersAddress;74}7576impl pallet_structure::Config for Runtime {77 type RuntimeEvent = RuntimeEvent;78 type RuntimeCall = RuntimeCall;79 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;80}8182impl pallet_fungible::Config for Runtime {83 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;84}85impl pallet_refungible::Config for Runtime {86 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;87}88impl pallet_nonfungible::Config for Runtime {89 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;90}9192parameter_types! {93 pub const Decimals: u8 = DECIMALS;94 pub Name: String = RUNTIME_NAME.to_string();95 pub Symbol: String = TOKEN_SYMBOL.to_string();96}97impl pallet_balances_adapter::Config for Runtime {98 type Inspect = Balances;99 type Mutate = Balances;100 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;101 type Decimals = Decimals;102 type Name = Name;103 type Symbol = Symbol;104 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;105}106107parameter_types! {108 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied109}110111/// Used for the pallet inflation112impl pallet_inflation::Config for Runtime {113 type Currency = Balances;114 type TreasuryAccountId = TreasuryAccountId;115 type InflationBlockInterval = InflationBlockInterval;116 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;117}118119impl pallet_unique::Config for Runtime {120 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;121 type CommonWeightInfo = CommonWeights<Self>;122 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;123}124125parameter_types! {126 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);127 pub const MaxCollators: u32 = MAX_COLLATORS;128 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;129 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;130 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;131}132133impl pallet_configuration::Config for Runtime {134 type RuntimeEvent = RuntimeEvent;135 type Balance = Balance;136 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;137 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;138 type DefaultCollatorSelectionMaxCollators = MaxCollators;139 type DefaultCollatorSelectionKickThreshold = SessionPeriod;140 type DefaultCollatorSelectionLicenseBond = LicenseBond;141 type MaxXcmAllowedLocations = ConstU32<16>;142 type AppPromotionDailyRate = AppPromotionDailyRate;143 type DayRelayBlocks = DayRelayBlocks;144 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;145}146147impl pallet_maintenance::Config for Runtime {148 type RuntimeEvent = RuntimeEvent;149150 type RuntimeCall = RuntimeCall;151152 #[cfg(feature = "governance")]153 type ManagerOrigin = governance::RootOrTechnicalCommitteeMember;154155 #[cfg(not(feature = "governance"))]156 type ManagerOrigin = frame_system::EnsureRoot<AccountId>;157158 type PreimageOrigin = frame_system::EnsureRoot<AccountId>;159160 #[cfg(feature = "preimage")]161 type Preimages = crate::Preimage;162 #[cfg(not(feature = "preimage"))]163 type Preimages = ();164 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;165}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/>.1617use alloc::string::{String, ToString};18use frame_support::parameter_types;19use sp_runtime::traits::AccountIdConversion;20use crate::{21 runtime_common::{22 dispatch::CollectionDispatchT,23 config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},24 weights::CommonWeights,25 RelayChainBlockNumberProvider,26 },27 Runtime, RuntimeEvent, RuntimeCall, RUNTIME_NAME, TOKEN_SYMBOL, DECIMALS, Balances,28};29use frame_support::traits::{ConstU32, ConstU64, Currency};30use up_common::{31 types::{AccountId, Balance, BlockNumber},32 constants::*,33};34use up_data_structs::{35 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},36};37use sp_arithmetic::Perbill;3839#[cfg(feature = "unique-scheduler")]40pub mod scheduler;4142#[cfg(feature = "foreign-assets")]43pub mod foreign_asset;4445#[cfg(feature = "app-promotion")]46pub mod app_promotion;4748#[cfg(feature = "collator-selection")]49pub mod collator_selection;5051#[cfg(feature = "preimage")]52pub mod preimage;5354#[cfg(feature = "governance")]55pub mod governance;5657parameter_types! {58 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;59 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();60}6162impl pallet_common::Config for Runtime {63 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;64 type RuntimeEvent = RuntimeEvent;65 type Currency = Balances;66 type CollectionCreationPrice = CollectionCreationPrice;67 type TreasuryAccountId = TreasuryAccountId;68 type CollectionDispatch = CollectionDispatchT<Self>;6970 type EvmTokenAddressMapping = EvmTokenAddressMapping;71 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;72 type ContractAddress = EvmCollectionHelpersAddress;73}7475impl pallet_structure::Config for Runtime {76 type RuntimeEvent = RuntimeEvent;77 type RuntimeCall = RuntimeCall;78 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;79}8081impl pallet_fungible::Config for Runtime {82 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;83}84impl pallet_refungible::Config for Runtime {85 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;86}87impl pallet_nonfungible::Config for Runtime {88 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;89}9091parameter_types! {92 pub const Decimals: u8 = DECIMALS;93 pub Name: String = RUNTIME_NAME.to_string();94 pub Symbol: String = TOKEN_SYMBOL.to_string();95}96impl pallet_balances_adapter::Config for Runtime {97 type Inspect = Balances;98 type Mutate = Balances;99 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;100 type Decimals = Decimals;101 type Name = Name;102 type Symbol = Symbol;103 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;104}105106parameter_types! {107 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied108}109110/// Used for the pallet inflation111impl pallet_inflation::Config for Runtime {112 type Currency = Balances;113 type TreasuryAccountId = TreasuryAccountId;114 type InflationBlockInterval = InflationBlockInterval;115 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;116}117118impl pallet_unique::Config for Runtime {119 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;120 type CommonWeightInfo = CommonWeights<Self>;121 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;122}123124parameter_types! {125 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);126 pub const MaxCollators: u32 = MAX_COLLATORS;127 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;128 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;129 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;130}131132impl pallet_configuration::Config for Runtime {133 type RuntimeEvent = RuntimeEvent;134 type Balance = Balance;135 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;136 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;137 type DefaultCollatorSelectionMaxCollators = MaxCollators;138 type DefaultCollatorSelectionKickThreshold = SessionPeriod;139 type DefaultCollatorSelectionLicenseBond = LicenseBond;140 type MaxXcmAllowedLocations = ConstU32<16>;141 type AppPromotionDailyRate = AppPromotionDailyRate;142 type DayRelayBlocks = DayRelayBlocks;143 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;144}145146impl pallet_maintenance::Config for Runtime {147 type RuntimeEvent = RuntimeEvent;148149 type RuntimeCall = RuntimeCall;150151 #[cfg(feature = "governance")]152 type ManagerOrigin = governance::RootOrTechnicalCommitteeMember;153154 #[cfg(not(feature = "governance"))]155 type ManagerOrigin = frame_system::EnsureRoot<AccountId>;156157 type PreimageOrigin = frame_system::EnsureRoot<AccountId>;158159 #[cfg(feature = "preimage")]160 type Preimages = crate::Preimage;161 #[cfg(not(feature = "preimage"))]162 type Preimages = ();163 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;164}runtime/common/ethereum/sponsoring.rsdiffbeforeafterboth--- a/runtime/common/ethereum/sponsoring.rs
+++ b/runtime/common/ethereum/sponsoring.rs
@@ -161,7 +161,8 @@
}
}
CollectionMode::ReFungible => {
- let call = <UniqueRefungibleCall<T>>::parse_full(&call_context.input).ok()??;
+ let call =
+ <UniqueRefungibleCall<T>>::parse_full(&call_context.input).ok()??;
refungible::call_sponsor(call, collection, who).map(|()| sponsor)
}
CollectionMode::Fungible(_) => {