difftreelog
refactor optimize common runtime imports
in: master
7 files changed
runtime/common/config/ethereum.rsdiffbeforeafterboth--- a/runtime/common/config/ethereum.rs
+++ b/runtime/common/config/ethereum.rs
@@ -9,7 +9,7 @@
runtime_common::{
constants::*,
dispatch::CollectionDispatchT,
- ethereum::{EvmSponsorshipHandler},
+ ethereum::sponsoring::EvmSponsorshipHandler,
config::sponsoring::DefaultSponsoringRateLimit,
DealWithFees,
},
runtime/common/config/mod.rsdiffbeforeafterboth--- a/runtime/common/config/mod.rs
+++ b/runtime/common/config/mod.rs
@@ -21,13 +21,3 @@
pub mod parachain;
pub mod xcm;
pub mod orml;
-
-pub use {
- substrate::*,
- ethereum::*,
- sponsoring::*,
- pallets::*,
- parachain::*,
- self::xcm::*,
- orml::*,
-};
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 frame_support::{18 // weights::{Weight, constants::WEIGHT_PER_SECOND},19 parameter_types,20};21use sp_runtime::traits::AccountIdConversion;22use crate::{23 runtime_common::{24 constants::*,25 dispatch::CollectionDispatchT,26 config::{27 substrate::TreasuryModuleId,28 ethereum::EvmCollectionHelpersAddress,29 },30 weights::CommonWeights,31 RelayChainBlockNumberProvider,32 },33 Runtime,34 Event,35 Call,36 Balances,37};38use common_types::{AccountId, Balance, BlockNumber};39use up_data_structs::{40 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},41};4243#[cfg(feature = "rmrk")]44pub mod rmrk;4546#[cfg(feature = "scheduler")]47pub mod scheduler;4849parameter_types! {50 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();51 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;52}5354impl pallet_common::Config for Runtime {55 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;56 type Event = Event;57 type Currency = Balances;58 type CollectionCreationPrice = CollectionCreationPrice;59 type TreasuryAccountId = TreasuryAccountId;60 type CollectionDispatch = CollectionDispatchT<Self>;6162 type EvmTokenAddressMapping = EvmTokenAddressMapping;63 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;64 type ContractAddress = EvmCollectionHelpersAddress;65}6667impl pallet_structure::Config for Runtime {68 type Event = Event;69 type Call = Call;70 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;71}7273impl pallet_fungible::Config for Runtime {74 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;75}76impl pallet_refungible::Config for Runtime {77 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;78}79impl pallet_nonfungible::Config for Runtime {80 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;81}8283parameter_types! {84 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied85}8687/// Used for the pallet inflation88impl pallet_inflation::Config for Runtime {89 type Currency = Balances;90 type TreasuryAccountId = TreasuryAccountId;91 type InflationBlockInterval = InflationBlockInterval;92 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;93}9495impl pallet_unique::Config for Runtime {96 type Event = Event;97 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;98 type CommonWeightInfo = CommonWeights<Self>;99 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;100}runtime/common/ethereum/mod.rsdiffbeforeafterboth--- a/runtime/common/ethereum/mod.rs
+++ b/runtime/common/ethereum/mod.rs
@@ -17,9 +17,3 @@
pub mod sponsoring;
pub mod transaction_converter;
pub mod self_contained_call;
-
-pub use {
- sponsoring::*,
- transaction_converter::*,
- self_contained_call::*,
-};
runtime/common/instance.rsdiffbeforeafterboth--- a/runtime/common/instance.rs
+++ b/runtime/common/instance.rs
@@ -1,7 +1,7 @@
use crate::{
runtime_common::{
config::ethereum::CrossAccountId,
- ethereum::TransactionConverter
+ ethereum::transaction_converter::TransactionConverter
},
Runtime,
};
runtime/common/mod.rsdiffbeforeafterboth--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -14,26 +14,16 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-mod constants;
-mod construct_runtime;
-mod dispatch;
-mod runtime_apis;
-mod sponsoring;
-mod weights;
-mod config;
-mod instance;
-mod ethereum;
-mod scheduler;
-
-pub use {
- constants::*,
- dispatch::*,
- sponsoring::*,
- weights::*,
- config::*,
- instance::*,
- ethereum::*,
-};
+pub mod constants;
+pub mod construct_runtime;
+pub mod dispatch;
+pub mod runtime_apis;
+pub mod sponsoring;
+pub mod weights;
+pub mod config;
+pub mod instance;
+pub mod ethereum;
+pub mod scheduler;
use sp_core::H160;
use frame_support::traits::{Currency, OnUnbalanced, Imbalance};
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -50,6 +50,11 @@
Runner, account::CrossAccountId as _,
Account as EVMAccount, FeeCalculator,
};
+ use runtime_common::{
+ sponsoring::{SponsorshipPredict, UniqueSponsorshipPredict},
+ dispatch::CollectionDispatch,
+ config::ethereum::CrossAccountId,
+ };
use up_data_structs::*;