diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs index 5ec665682ddaa0ece69e45d81b3722f3bab050ac..cc4841418beec51495840a9679c61c7e21b08248 100644 --- a/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs +++ b/substrate/frame/support/procedural/src/construct_runtime/expand/call.rs @@ -123,9 +123,7 @@ pub fn expand_outer_dispatch( } } } - // Deprecated, but will warn when used - #[allow(deprecated)] - impl #scrate::weights::GetDispatchInfo for RuntimeCall {} + impl #scrate::dispatch::GetCallMetadata for RuntimeCall { fn get_call_metadata(&self) -> #scrate::dispatch::CallMetadata { use #scrate::dispatch::GetCallName; diff --git a/substrate/frame/support/procedural/src/pallet/expand/call.rs b/substrate/frame/support/procedural/src/pallet/expand/call.rs index 031fa02bb9d6d82fc655986523d4e0df9e4806fe..aa6a8e09f5250828145257ab5cca1e15756c4ea2 100644 --- a/substrate/frame/support/procedural/src/pallet/expand/call.rs +++ b/substrate/frame/support/procedural/src/pallet/expand/call.rs @@ -351,10 +351,6 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream { } } - // Deprecated, but will warn when used - #[allow(deprecated)] - impl<#type_impl_gen> #frame_support::weights::GetDispatchInfo for #call_ident<#type_use_gen> #where_clause {} - impl<#type_impl_gen> #frame_support::dispatch::GetCallName for #call_ident<#type_use_gen> #where_clause { diff --git a/substrate/frame/support/src/weights.rs b/substrate/frame/support/src/weights.rs index 75eba8fbe9883d0d5ce77c0dfbf9d1cf0fae5255..7941f2a89a5504d46596907d0484b492b6d1babb 100644 --- a/substrate/frame/support/src/weights.rs +++ b/substrate/frame/support/src/weights.rs @@ -22,7 +22,6 @@ mod extrinsic_weights; mod paritydb_weights; mod rocksdb_weights; -use crate::dispatch; pub use sp_weights::*; /// These constants are specific to FRAME, and the current implementation of its various components. @@ -38,70 +37,3 @@ pub mod constants { paritydb_weights::constants::ParityDbWeight, rocksdb_weights::constants::RocksDbWeight, }; } - -#[deprecated = "Function has moved to `frame_support::dispatch`"] -pub fn extract_actual_pays_fee( - res: &dispatch::DispatchResultWithPostInfo, - info: &dispatch::DispatchInfo, -) -> dispatch::Pays { - dispatch::extract_actual_pays_fee(res, info) -} -#[deprecated = "Function has moved to `frame_support::dispatch`"] -pub fn extract_actual_weight( - res: &dispatch::DispatchResultWithPostInfo, - info: &dispatch::DispatchInfo, -) -> Weight { - dispatch::extract_actual_weight(res, info) -} -#[deprecated = "Trait has moved to `frame_support::dispatch`"] -pub trait ClassifyDispatch<T>: dispatch::ClassifyDispatch<T> { - fn classify_dispatch(&self, target: T) -> dispatch::DispatchClass { - <Self as dispatch::ClassifyDispatch<T>>::classify_dispatch(self, target) - } -} -#[deprecated = "Enum has moved to `frame_support::dispatch`"] -pub type DispatchClass = dispatch::DispatchClass; -#[deprecated = "Struct has moved to `frame_support::dispatch`"] -pub type DispatchInfo = dispatch::DispatchInfo; -#[deprecated = "Trait has moved to `frame_support::dispatch`"] -pub trait GetDispatchInfo: dispatch::GetDispatchInfo { - fn get_dispatch_info(&self) -> dispatch::DispatchInfo { - <Self as dispatch::GetDispatchInfo>::get_dispatch_info(self) - } -} -#[deprecated = "Trait has moved to `frame_support::dispatch`"] -pub trait OneOrMany<T>: dispatch::OneOrMany<T> { - fn into_iter(self) -> Self::Iter - where - Self: Sized, - { - <Self as dispatch::OneOrMany<T>>::into_iter(self) - } -} -#[deprecated = "Enum has moved to `frame_support::dispatch`"] -pub type Pays = dispatch::Pays; -#[deprecated = "Trait has moved to `frame_support::dispatch`"] -pub trait PaysFee<T>: dispatch::PaysFee<T> { - fn pays_fee(&self, target: T) -> dispatch::Pays { - <Self as dispatch::PaysFee<T>>::pays_fee(self, target) - } -} -#[deprecated = "Struct has moved to `frame_support::dispatch`"] -pub type PerDispatchClass<T> = dispatch::PerDispatchClass<T>; -#[deprecated = "Struct has moved to `frame_support::dispatch`"] -pub type PostDispatchInfo = dispatch::PostDispatchInfo; -#[deprecated = "Trait has moved to `frame_support::dispatch`"] -pub trait WeighData<T>: dispatch::WeighData<T> { - fn weigh_data(&self, target: T) -> Weight { - <Self as dispatch::WeighData<T>>::weigh_data(self, target) - } -} -#[deprecated = "Trait has moved to `frame_support::dispatch`"] -pub trait WithPostDispatchInfo: dispatch::WithPostDispatchInfo { - fn with_weight(self, actual_weight: Weight) -> dispatch::DispatchErrorWithPostInfo - where - Self: Sized, - { - <Self as dispatch::WithPostDispatchInfo>::with_weight(self, actual_weight) - } -}