@@ -48,8 +48,6 @@ use pallet_grandpa::AuthorityList as GrandpaAuthorityList;
4848use pallet_grandpa:: fg_primitives;
4949use pallet_im_online:: sr25519:: AuthorityId as ImOnlineId ;
5050use sp_authority_discovery:: AuthorityId as AuthorityDiscoveryId ;
51- use pallet_transaction_payment_rpc_runtime_api:: RuntimeDispatchInfo ;
52- use pallet_contracts_rpc_runtime_api:: ContractExecResult ;
5351use sp_inherents:: { InherentData , CheckInherentsResult } ;
5452
5553#[ cfg( any( feature = "std" , test) ) ]
@@ -215,23 +213,6 @@ impl pallet_balances::Trait for Runtime {
215213 type AccountStore = frame_system:: Module < Runtime > ;
216214}
217215
218- parameter_types ! {
219- pub const TransactionByteFee : Balance = 10 * MILLICENTS ;
220- // In the Substrate node, a weight of 10_000_000 (smallest non-zero weight)
221- // is mapped to 10_000_000 units of fees, hence:
222- pub const WeightFeeCoefficient : Balance = 1 ;
223- // for a sane configuration, this should always be less than `AvailableBlockRatio`.
224- pub const TargetBlockFullness : Perquintill = Perquintill :: from_percent( 25 ) ;
225- }
226-
227- impl pallet_transaction_payment:: Trait for Runtime {
228- type Currency = Balances ;
229- type OnTransactionPayment = DealWithFees ;
230- type TransactionByteFee = TransactionByteFee ;
231- type WeightToFee = LinearWeightToFee < WeightFeeCoefficient > ;
232- type FeeMultiplierUpdate = TargetedFeeAdjustment < TargetBlockFullness > ;
233- }
234-
235216parameter_types ! {
236217 pub const MinimumPeriod : Moment = SLOT_DURATION / 2 ;
237218}
@@ -473,7 +454,6 @@ impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for R
473454 frame_system:: CheckEra :: < Runtime > :: from ( generic:: Era :: mortal ( period, current_block) ) ,
474455 frame_system:: CheckNonce :: < Runtime > :: from ( nonce) ,
475456 frame_system:: CheckWeight :: < Runtime > :: new ( ) ,
476- pallet_transaction_payment:: ChargeTransactionPayment :: < Runtime > :: from ( tip) ,
477457 ) ;
478458 let raw_payload = SignedPayload :: new ( call, extra) . map_err ( |e| {
479459 debug:: warn!( "Unable to create signed payload: {:?}" , e) ;
@@ -599,7 +579,6 @@ construct_runtime!(
599579 Authorship : pallet_authorship:: { Module , Call , Storage , Inherent } ,
600580 Indices : pallet_indices:: { Module , Call , Storage , Config <T >, Event <T >} ,
601581 Balances : pallet_balances:: { Module , Call , Storage , Config <T >, Event <T >} ,
602- TransactionPayment : pallet_transaction_payment:: { Module , Storage } ,
603582 Staking : pallet_staking:: { Module , Call , Config <T >, Storage , Event <T >, ValidateUnsigned } ,
604583 Session : pallet_session:: { Module , Call , Storage , Event , Config <T >} ,
605584 Democracy : pallet_democracy:: { Module , Call , Storage , Config , Event <T >} ,
@@ -638,7 +617,6 @@ pub type SignedExtra = (
638617 frame_system:: CheckEra < Runtime > ,
639618 frame_system:: CheckNonce < Runtime > ,
640619 frame_system:: CheckWeight < Runtime > ,
641- pallet_transaction_payment:: ChargeTransactionPayment < Runtime > ,
642620) ;
643621/// Unchecked extrinsic type as expected by this runtime.
644622pub type UncheckedExtrinsic = generic:: UncheckedExtrinsic < Address , Call , Signature , SignedExtra > ;
@@ -747,16 +725,6 @@ impl_runtime_apis! {
747725 }
748726 }
749727
750- impl pallet_transaction_payment_rpc_runtime_api:: TransactionPaymentApi <
751- Block ,
752- Balance ,
753- UncheckedExtrinsic ,
754- > for Runtime {
755- fn query_info( uxt: UncheckedExtrinsic , len: u32 ) -> RuntimeDispatchInfo <Balance > {
756- TransactionPayment :: query_info( uxt, len)
757- }
758- }
759-
760728 impl sp_session:: SessionKeys <Block > for Runtime {
761729 fn generate_session_keys( seed: Option <Vec <u8 >>) -> Vec <u8 > {
762730 SessionKeys :: generate( seed)
0 commit comments