diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 76b77d39f0205..b6be9335ca94c 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -82,7 +82,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // implementation changes and behavior does not, then leave spec_version as // is and increment impl_version. spec_version: 224, - impl_version: 1, + impl_version: 2, apis: RUNTIME_API_VERSIONS, }; diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs index e68681af1979c..f58833440c2ff 100644 --- a/frame/executive/src/lib.rs +++ b/frame/executive/src/lib.rs @@ -60,9 +60,7 @@ //! # pub type AllModules = u64; //! # pub enum Runtime {}; //! # use sp_runtime::transaction_validity::{TransactionValidity, UnknownTransaction}; -//! # #[allow(deprecated)] //! # use sp_runtime::traits::ValidateUnsigned; -//! # #[allow(deprecated)] //! # impl ValidateUnsigned for Runtime { //! # type Call = (); //! # @@ -88,7 +86,6 @@ use sp_runtime::{ transaction_validity::TransactionValidity, }; use sp_runtime::generic::CheckSignature; -#[allow(deprecated)] use sp_runtime::traits::ValidateUnsigned; use codec::{Codec, Encode}; use frame_system::{extrinsics_root, DigestOf}; @@ -107,7 +104,6 @@ pub struct Executive( PhantomData<(System, Block, Context, UnsignedValidator, AllModules)> ); -#[allow(deprecated)] // Allow ValidateUnsigned, remove the attribute when the trait is removed. impl< System: frame_system::Trait, Block: traits::Block, @@ -133,7 +129,6 @@ where } } -#[allow(deprecated)] // Allow ValidateUnsigned, remove the attribute when the trait is removed. impl< System: frame_system::Trait, Block: traits::Block, @@ -501,7 +496,6 @@ mod tests { } impl custom::Trait for Runtime {} - #[allow(deprecated)] impl ValidateUnsigned for Runtime { type Call = Call; diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs index 0132bcedd20d4..d6d13c66c2501 100644 --- a/frame/im-online/src/lib.rs +++ b/frame/im-online/src/lib.rs @@ -617,7 +617,6 @@ impl pallet_session::OneSessionHandler for Module { } } -#[allow(deprecated)] impl frame_support::unsigned::ValidateUnsigned for Module { type Call = Call; diff --git a/frame/im-online/src/tests.rs b/frame/im-online/src/tests.rs index 4ce5dec9613d0..b43adca0fd485 100644 --- a/frame/im-online/src/tests.rs +++ b/frame/im-online/src/tests.rs @@ -112,7 +112,6 @@ fn heartbeat( authority_index: u32, id: UintAuthorityId, ) -> dispatch::DispatchResult { - #[allow(deprecated)] use frame_support::unsigned::ValidateUnsigned; let heartbeat = Heartbeat { @@ -126,7 +125,6 @@ fn heartbeat( }; let signature = id.sign(&heartbeat.encode()).unwrap(); - #[allow(deprecated)] // Allow ValidateUnsigned ImOnline::pre_dispatch(&crate::Call::heartbeat(heartbeat.clone(), signature.clone())) .map_err(|e| <&'static str>::from(e))?; ImOnline::heartbeat( diff --git a/frame/support/src/unsigned.rs b/frame/support/src/unsigned.rs index 319fa3adb448f..4289e4e474f53 100644 --- a/frame/support/src/unsigned.rs +++ b/frame/support/src/unsigned.rs @@ -15,7 +15,6 @@ // along with Substrate. If not, see . #[doc(hidden)] -#[allow(deprecated)] pub use crate::sp_runtime::traits::ValidateUnsigned; #[doc(hidden)] pub use crate::sp_runtime::transaction_validity::{ @@ -66,7 +65,6 @@ macro_rules! impl_outer_validate_unsigned { $( $module:ident )* } ) => { - #[allow(deprecated)] // Allow ValidateUnsigned impl $crate::unsigned::ValidateUnsigned for $runtime { type Call = Call; @@ -109,7 +107,6 @@ mod test_partial_and_full_call { pub mod timestamp { pub struct Module; - #[allow(deprecated)] // Allow ValidateUnsigned impl super::super::ValidateUnsigned for Module { type Call = Call; diff --git a/primitives/runtime/src/generic/checked_extrinsic.rs b/primitives/runtime/src/generic/checked_extrinsic.rs index b2d247ef5f913..20aefbdf990ba 100644 --- a/primitives/runtime/src/generic/checked_extrinsic.rs +++ b/primitives/runtime/src/generic/checked_extrinsic.rs @@ -20,7 +20,6 @@ use crate::traits::{ self, Member, MaybeDisplay, SignedExtension, Dispatchable, }; -#[allow(deprecated)] use crate::traits::ValidateUnsigned; use crate::transaction_validity::TransactionValidity; @@ -54,7 +53,6 @@ where self.signed.as_ref().map(|x| &x.0) } - #[allow(deprecated)] // Allow ValidateUnsigned fn validate>( &self, info: Self::DispatchInfo, @@ -69,7 +67,6 @@ where } } - #[allow(deprecated)] // Allow ValidateUnsigned fn apply>( self, info: Self::DispatchInfo, diff --git a/primitives/runtime/src/testing.rs b/primitives/runtime/src/testing.rs index be0e36b2d1a6b..6f6ea3dd1645f 100644 --- a/primitives/runtime/src/testing.rs +++ b/primitives/runtime/src/testing.rs @@ -23,7 +23,6 @@ use crate::traits::{ self, Checkable, Applyable, BlakeTwo256, OpaqueKeys, SignedExtension, Dispatchable, }; -#[allow(deprecated)] use crate::traits::ValidateUnsigned; use crate::{generic::{self, CheckSignature}, KeyTypeId, ApplyExtrinsicResult}; pub use sp_core::{H256, sr25519}; @@ -418,7 +417,6 @@ impl Applyable for TestXt where fn sender(&self) -> Option<&Self::AccountId> { self.signature.as_ref().map(|x| &x.0) } /// Checks to see if this is a valid *transaction*. It returns information on it if so. - #[allow(deprecated)] // Allow ValidateUnsigned fn validate>( &self, _info: Self::DispatchInfo, @@ -429,7 +427,6 @@ impl Applyable for TestXt where /// Executes all necessary logic needed prior to dispatch and deconstructs into function call, /// index and sender. - #[allow(deprecated)] // Allow ValidateUnsigned fn apply>( self, info: Self::DispatchInfo, diff --git a/primitives/runtime/src/traits.rs b/primitives/runtime/src/traits.rs index f6655f68b4502..fef20c826af12 100644 --- a/primitives/runtime/src/traits.rs +++ b/primitives/runtime/src/traits.rs @@ -889,7 +889,6 @@ pub trait Applyable: Sized + Send + Sync { fn sender(&self) -> Option<&Self::AccountId>; /// Checks to see if this is a valid *transaction*. It returns information on it if so. - #[allow(deprecated)] // Allow ValidateUnsigned fn validate>( &self, info: Self::DispatchInfo, @@ -898,7 +897,6 @@ pub trait Applyable: Sized + Send + Sync { /// Executes all necessary logic needed prior to dispatch and deconstructs into function call, /// index and sender. - #[allow(deprecated)] // Allow ValidateUnsigned fn apply>( self, info: Self::DispatchInfo, @@ -924,7 +922,6 @@ pub trait GetNodeBlockType { /// the transaction for the transaction pool. /// During block execution phase one need to perform the same checks anyway, /// since this function is not being called. -#[deprecated(note = "Use SignedExtensions instead.")] pub trait ValidateUnsigned { /// The call to validate type Call;