git.delta.rocks / unique-network / refs/commits / fe18d26b2253

difftreelog

fix unify opal with other runtimes

Daniel Shiposha2022-08-02parent: #8699eab.patch.diff
in: master

1 file changed

modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
28use sp_api::impl_runtime_apis;28use sp_api::impl_runtime_apis;
29use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};29use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};
30use sp_runtime::DispatchError;30use sp_runtime::DispatchError;
31#[cfg(feature = "scheduler")]
31use fp_self_contained::*;32use fp_self_contained::*;
33
34#[cfg(feature = "scheduler")]
35use sp_runtime::{
36 traits::{Applyable, Member},
37 generic::Era,
38 DispatchErrorWithPostInfo
39};
32// #[cfg(any(feature = "std", test))]40// #[cfg(any(feature = "std", test))]
33// pub use sp_runtime::BuildStorage;41// pub use sp_runtime::BuildStorage;
3442
35use sp_runtime::{43use sp_runtime::{
36 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,44 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,
37 traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, AccountIdConversion, Zero, Member},45 traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, AccountIdConversion, Zero},
38 transaction_validity::{TransactionSource, TransactionValidity},46 transaction_validity::{TransactionSource, TransactionValidity},
39 ApplyExtrinsicResult, RuntimeAppPublic,47 ApplyExtrinsicResult, RuntimeAppPublic,
40};48};
70 },78 },
71};79};
80
81#[cfg(feature = "scheduler")]
72use pallet_unique_scheduler::DispatchCall;82use pallet_unique_scheduler::DispatchCall;
83
73use up_data_structs::{84use up_data_structs::{
89 traits::{BaseArithmetic, Unsigned},100 traits::{BaseArithmetic, Unsigned},
90};101};
91use smallvec::smallvec;102use smallvec::smallvec;
92// use scale_info::TypeInfo;
93use codec::{Encode, Decode};103use codec::{Encode, Decode};
94use fp_rpc::TransactionStatus;104use fp_rpc::TransactionStatus;
95use sp_runtime::{105use sp_runtime::{
96 traits::{106 traits::{
97 Applyable, BlockNumberProvider, Dispatchable, PostDispatchInfoOf, DispatchInfoOf,107 BlockNumberProvider, Dispatchable, PostDispatchInfoOf, DispatchInfoOf,
98 Saturating, CheckedConversion,108 Saturating, CheckedConversion,
99 },109 },
100 generic::Era,
101 transaction_validity::TransactionValidityError,110 transaction_validity::TransactionValidityError, SaturatedConversion,
102 DispatchErrorWithPostInfo, SaturatedConversion,
103};111};
104112
105// pub use pallet_timestamp::Call as TimestampCall;113// pub use pallet_timestamp::Call as TimestampCall;
127 Error as XcmError,135 Error as XcmError,
128};136};
129use xcm_executor::traits::{MatchesFungible, WeightTrader};137use xcm_executor::traits::{MatchesFungible, WeightTrader};
130//use xcm_executor::traits::MatchesFungible;
131138
132use unique_runtime_common::{139use unique_runtime_common::{
133 construct_runtime,140 construct_runtime,
950957
951type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;958type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;
959
960#[cfg(feature = "scheduler")]
952use frame_support::traits::NamedReservableCurrency;961use frame_support::traits::NamedReservableCurrency;
953962
963#[cfg(feature = "scheduler")]
954fn get_signed_extras(from: <Runtime as frame_system::Config>::AccountId) -> SignedExtraScheduler {964fn get_signed_extras(from: <Runtime as frame_system::Config>::AccountId) -> SignedExtraScheduler {
955 (965 (
956 frame_system::CheckSpecVersion::<Runtime>::new(),966 frame_system::CheckSpecVersion::<Runtime>::new(),
965 )975 )
966}976}
967977
978#[cfg(feature = "scheduler")]
968pub struct SchedulerPaymentExecutor;979pub struct SchedulerPaymentExecutor;
969980
970#[cfg(feature = "scheduler")]981#[cfg(feature = "scheduler")]