From 4fd3f1a9d1515a4385c64603e116e5c03da41333 Mon Sep 17 00:00:00 2001 From: runcomet Date: Fri, 22 Nov 2024 14:51:58 -0800 Subject: [PATCH 1/9] frame::prelude --- Cargo.lock | 6 +---- .../frame/authority-discovery/Cargo.toml | 18 +++---------- .../frame/authority-discovery/src/lib.rs | 27 ++++++++++++------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02d7da8f7657..d5f3fbcea703 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11957,16 +11957,12 @@ dependencies = [ name = "pallet-authority-discovery" version = "28.0.0" dependencies = [ - "frame-support 28.0.0", - "frame-system 28.0.0", "pallet-session 28.0.0", "parity-scale-codec", + "polkadot-sdk-frame 0.1.0", "scale-info", "sp-application-crypto 30.0.0", "sp-authority-discovery 26.0.0", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.1", ] [[package]] diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml index 01f574a262ad..45117e0fdf05 100644 --- a/substrate/frame/authority-discovery/Cargo.toml +++ b/substrate/frame/authority-discovery/Cargo.toml @@ -20,36 +20,24 @@ codec = { features = [ "derive", ], workspace = true } scale-info = { features = ["derive"], workspace = true } -frame-support = { workspace = true } -frame-system = { workspace = true } +frame = { workspace = true, features = ["experimental", "runtime"] } pallet-session = { features = [ "historical", ], workspace = true } sp-application-crypto = { workspace = true } sp-authority-discovery = { workspace = true } -sp-runtime = { workspace = true } - -[dev-dependencies] -sp-core = { workspace = true, default-features = true } -sp-io = { workspace = true, default-features = true } [features] default = ["std"] std = [ "codec/std", - "frame-support/std", - "frame-system/std", + "frame/std", "pallet-session/std", "scale-info/std", "sp-application-crypto/std", "sp-authority-discovery/std", - "sp-core/std", - "sp-io/std", - "sp-runtime/std", ] try-runtime = [ - "frame-support/try-runtime", - "frame-system/try-runtime", + "frame/try-runtime", "pallet-session/try-runtime", - "sp-runtime/try-runtime", ] diff --git a/substrate/frame/authority-discovery/src/lib.rs b/substrate/frame/authority-discovery/src/lib.rs index 220b39292b57..98808b0e5f6f 100644 --- a/substrate/frame/authority-discovery/src/lib.rs +++ b/substrate/frame/authority-discovery/src/lib.rs @@ -26,18 +26,23 @@ extern crate alloc; use alloc::vec::Vec; +use frame::{prelude::*, traits::{Get, OneSessionHandler}, deps::frame_support::WeakBoundedVec, derive::DefaultNoBound}; +/* use frame_support::{ traits::{Get, OneSessionHandler}, WeakBoundedVec, }; +*/ use sp_authority_discovery::AuthorityId; pub use pallet::*; -#[frame_support::pallet] +// #[frame_support::pallet] +#[frame::pallet] pub mod pallet { use super::*; - use frame_support::pallet_prelude::*; + // use frame_support::pallet_prelude::*; + // use frame::deps::frame_support::pallet_prelude::*; #[pallet::pallet] pub struct Pallet(_); @@ -59,7 +64,7 @@ pub mod pallet { pub(super) type NextKeys = StorageValue<_, WeakBoundedVec, ValueQuery>; - #[derive(frame_support::DefaultNoBound)] + #[derive(DefaultNoBound)] #[pallet::genesis_config] pub struct GenesisConfig { pub keys: Vec, @@ -113,7 +118,7 @@ impl Pallet { } } -impl sp_runtime::BoundToRuntimeAppPublic for Pallet { +impl frame::deps::sp_runtime::BoundToRuntimeAppPublic for Pallet { type Public = AuthorityId; } @@ -171,9 +176,12 @@ mod tests { use super::*; use crate as pallet_authority_discovery; use alloc::vec; - use frame_support::{derive_impl, parameter_types, traits::ConstU32}; + + //use frame_support::{derive_impl, parameter_types, traits::ConstU32}; use sp_application_crypto::Pair; use sp_authority_discovery::AuthorityPair; + use frame::{testing_prelude::TestExternalities, traits::{ConvertInto, IdentityLookup, OpaqueKeys, ConstU32}, runtime::{prelude::{construct_runtime, parameter_types, derive_impl}, testing_prelude::BuildStorage}, deps::sp_runtime::KeyTypeId, arithmetic::Perbill}; + /* use sp_core::crypto::key_types; use sp_io::TestExternalities; use sp_runtime::{ @@ -181,10 +189,11 @@ mod tests { traits::{ConvertInto, IdentityLookup, OpaqueKeys}, BuildStorage, KeyTypeId, Perbill, }; + */ type Block = frame_system::mocking::MockBlock; - frame_support::construct_runtime!( + construct_runtime!( pub enum Test { System: frame_system, @@ -203,7 +212,7 @@ mod tests { impl pallet_session::Config for Test { type SessionManager = (); - type Keys = UintAuthorityId; + type Keys = frame::deps::sp_runtime::testing::UintAuthorityId; type ShouldEndSession = pallet_session::PeriodicSessions; type SessionHandler = TestSessionHandler; type RuntimeEvent = RuntimeEvent; @@ -234,7 +243,7 @@ mod tests { pub struct TestSessionHandler; impl pallet_session::SessionHandler for TestSessionHandler { - const KEY_TYPE_IDS: &'static [KeyTypeId] = &[key_types::DUMMY]; + const KEY_TYPE_IDS: &'static [KeyTypeId] = &[frame::deps::sp_core::crypto::key_types::DUMMY]; fn on_new_session( _changed: bool, @@ -308,7 +317,7 @@ mod tests { let mut externalities = TestExternalities::new(t); externalities.execute_with(|| { - use frame_support::traits::OneSessionHandler; + use frame::deps::frame_support::traits::OneSessionHandler; AuthorityDiscovery::on_genesis_session( first_authorities.iter().map(|id| (id, id.clone())), From 9129887a3acd30ed4f3259eb78ea2afc9b729c20 Mon Sep 17 00:00:00 2001 From: runcomet Date: Fri, 22 Nov 2024 18:36:43 -0800 Subject: [PATCH 2/9] cargo fmt --- .../frame/authority-discovery/src/lib.rs | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/substrate/frame/authority-discovery/src/lib.rs b/substrate/frame/authority-discovery/src/lib.rs index 98808b0e5f6f..593a0003f0c9 100644 --- a/substrate/frame/authority-discovery/src/lib.rs +++ b/substrate/frame/authority-discovery/src/lib.rs @@ -26,13 +26,12 @@ extern crate alloc; use alloc::vec::Vec; -use frame::{prelude::*, traits::{Get, OneSessionHandler}, deps::frame_support::WeakBoundedVec, derive::DefaultNoBound}; -/* -use frame_support::{ +use frame::{ + deps::frame_support::WeakBoundedVec, + derive::DefaultNoBound, + prelude::*, traits::{Get, OneSessionHandler}, - WeakBoundedVec, }; -*/ use sp_authority_discovery::AuthorityId; pub use pallet::*; @@ -41,8 +40,6 @@ pub use pallet::*; #[frame::pallet] pub mod pallet { use super::*; - // use frame_support::pallet_prelude::*; - // use frame::deps::frame_support::pallet_prelude::*; #[pallet::pallet] pub struct Pallet(_); @@ -176,20 +173,18 @@ mod tests { use super::*; use crate as pallet_authority_discovery; use alloc::vec; - - //use frame_support::{derive_impl, parameter_types, traits::ConstU32}; + use frame::{ + arithmetic::Perbill, + deps::sp_runtime::KeyTypeId, + runtime::{ + prelude::{construct_runtime, derive_impl, parameter_types}, + testing_prelude::BuildStorage, + }, + testing_prelude::TestExternalities, + traits::{ConstU32, ConvertInto, IdentityLookup, OpaqueKeys}, + }; use sp_application_crypto::Pair; use sp_authority_discovery::AuthorityPair; - use frame::{testing_prelude::TestExternalities, traits::{ConvertInto, IdentityLookup, OpaqueKeys, ConstU32}, runtime::{prelude::{construct_runtime, parameter_types, derive_impl}, testing_prelude::BuildStorage}, deps::sp_runtime::KeyTypeId, arithmetic::Perbill}; - /* - use sp_core::crypto::key_types; - use sp_io::TestExternalities; - use sp_runtime::{ - testing::UintAuthorityId, - traits::{ConvertInto, IdentityLookup, OpaqueKeys}, - BuildStorage, KeyTypeId, Perbill, - }; - */ type Block = frame_system::mocking::MockBlock; @@ -243,7 +238,8 @@ mod tests { pub struct TestSessionHandler; impl pallet_session::SessionHandler for TestSessionHandler { - const KEY_TYPE_IDS: &'static [KeyTypeId] = &[frame::deps::sp_core::crypto::key_types::DUMMY]; + const KEY_TYPE_IDS: &'static [KeyTypeId] = + &[frame::deps::sp_core::crypto::key_types::DUMMY]; fn on_new_session( _changed: bool, From c1c10234014818656fb1d4467924c66448120232 Mon Sep 17 00:00:00 2001 From: runcomet Date: Sun, 1 Dec 2024 00:45:02 -0800 Subject: [PATCH 3/9] add prdoc --- prdoc/pr_6619.prdoc | 13 +++++++++++++ substrate/frame/authority-discovery/src/lib.rs | 6 +----- 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 prdoc/pr_6619.prdoc diff --git a/prdoc/pr_6619.prdoc b/prdoc/pr_6619.prdoc new file mode 100644 index 000000000000..7f42baeede08 --- /dev/null +++ b/prdoc/pr_6619.prdoc @@ -0,0 +1,13 @@ +# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0 +# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json + +title: migrate pallet-authority-discovery to umbrella crate + +doc: + - audience: Runtime Dev + description: | + Imports frame umbrella crate systems into pallet-authority-discovery. + +crates: + - name: pallet-authority-discovery + bump: minor \ No newline at end of file diff --git a/substrate/frame/authority-discovery/src/lib.rs b/substrate/frame/authority-discovery/src/lib.rs index 593a0003f0c9..4eecd4b094d1 100644 --- a/substrate/frame/authority-discovery/src/lib.rs +++ b/substrate/frame/authority-discovery/src/lib.rs @@ -28,7 +28,6 @@ extern crate alloc; use alloc::vec::Vec; use frame::{ deps::frame_support::WeakBoundedVec, - derive::DefaultNoBound, prelude::*, traits::{Get, OneSessionHandler}, }; @@ -36,7 +35,6 @@ use sp_authority_discovery::AuthorityId; pub use pallet::*; -// #[frame_support::pallet] #[frame::pallet] pub mod pallet { use super::*; @@ -61,7 +59,7 @@ pub mod pallet { pub(super) type NextKeys = StorageValue<_, WeakBoundedVec, ValueQuery>; - #[derive(DefaultNoBound)] + #[derive(frame::derive::DefaultNoBound)] #[pallet::genesis_config] pub struct GenesisConfig { pub keys: Vec, @@ -313,8 +311,6 @@ mod tests { let mut externalities = TestExternalities::new(t); externalities.execute_with(|| { - use frame::deps::frame_support::traits::OneSessionHandler; - AuthorityDiscovery::on_genesis_session( first_authorities.iter().map(|id| (id, id.clone())), ); From 5fa4693e77a3796e8760bae08aeade9df7ae27d8 Mon Sep 17 00:00:00 2001 From: runcomet Date: Sat, 4 Jan 2025 02:07:40 +0100 Subject: [PATCH 4/9] WIP nit --- prdoc/pr_6619.prdoc | 13 ------------- substrate/frame/authority-discovery/src/lib.rs | 12 +----------- substrate/frame/src/lib.rs | 3 +++ 3 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 prdoc/pr_6619.prdoc diff --git a/prdoc/pr_6619.prdoc b/prdoc/pr_6619.prdoc deleted file mode 100644 index 7f42baeede08..000000000000 --- a/prdoc/pr_6619.prdoc +++ /dev/null @@ -1,13 +0,0 @@ -# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0 -# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json - -title: migrate pallet-authority-discovery to umbrella crate - -doc: - - audience: Runtime Dev - description: | - Imports frame umbrella crate systems into pallet-authority-discovery. - -crates: - - name: pallet-authority-discovery - bump: minor \ No newline at end of file diff --git a/substrate/frame/authority-discovery/src/lib.rs b/substrate/frame/authority-discovery/src/lib.rs index 4eecd4b094d1..b4fbdc9bb041 100644 --- a/substrate/frame/authority-discovery/src/lib.rs +++ b/substrate/frame/authority-discovery/src/lib.rs @@ -27,7 +27,6 @@ extern crate alloc; use alloc::vec::Vec; use frame::{ - deps::frame_support::WeakBoundedVec, prelude::*, traits::{Get, OneSessionHandler}, }; @@ -171,16 +170,7 @@ mod tests { use super::*; use crate as pallet_authority_discovery; use alloc::vec; - use frame::{ - arithmetic::Perbill, - deps::sp_runtime::KeyTypeId, - runtime::{ - prelude::{construct_runtime, derive_impl, parameter_types}, - testing_prelude::BuildStorage, - }, - testing_prelude::TestExternalities, - traits::{ConstU32, ConvertInto, IdentityLookup, OpaqueKeys}, - }; + use frame::testing_prelude::* use sp_application_crypto::Pair; use sp_authority_discovery::AuthorityPair; diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs index 03d815e349df..f9c777aa8d33 100644 --- a/substrate/frame/src/lib.rs +++ b/substrate/frame/src/lib.rs @@ -223,6 +223,9 @@ pub mod prelude { Saturating, StaticLookup, TrailingZeroInput, }; + /// Bounded storage related types. + pub use sp_runtime::{BoundedSlice, BoundedVec, WeakBoundedVec}; + /// Other error/result types for runtime #[doc(no_inline)] pub use sp_runtime::{DispatchErrorWithPostInfo, DispatchResultWithInfo, TokenError}; From 79d15d6162d2ab08d188988662ebf92c21663fe6 Mon Sep 17 00:00:00 2001 From: runcomet Date: Fri, 10 Jan 2025 00:30:10 +0100 Subject: [PATCH 5/9] sp-application-crypto to umbrella --- Cargo.lock | 2 +- substrate/frame/Cargo.toml | 3 ++ .../frame/authority-discovery/Cargo.toml | 3 -- .../frame/authority-discovery/src/lib.rs | 10 ++----- substrate/frame/src/lib.rs | 28 ++++++++++++++++--- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc9e4ae3ee33..f5c1a5064d95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12095,7 +12095,6 @@ dependencies = [ "parity-scale-codec", "polkadot-sdk-frame 0.1.0", "scale-info", - "sp-application-crypto 30.0.0", "sp-authority-discovery 26.0.0", ] @@ -19259,6 +19258,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api 26.0.0", + "sp-application-crypto 30.0.0", "sp-arithmetic 23.0.0", "sp-block-builder 26.0.0", "sp-consensus-aura 0.32.0", diff --git a/substrate/frame/Cargo.toml b/substrate/frame/Cargo.toml index 8fc0d8468430..b8175a9bea11 100644 --- a/substrate/frame/Cargo.toml +++ b/substrate/frame/Cargo.toml @@ -37,6 +37,7 @@ frame-system = { workspace = true } # primitive types used for developing FRAME runtimes. sp-api = { optional = true, workspace = true } +sp-application-crypto = { optional = true, workspace = true } sp-block-builder = { optional = true, workspace = true } sp-consensus-aura = { optional = true, workspace = true } sp-consensus-grandpa = { optional = true, workspace = true } @@ -72,6 +73,7 @@ runtime = [ "frame-executive", "frame-system-rpc-runtime-api", "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-consensus-aura", "sp-consensus-grandpa", @@ -96,6 +98,7 @@ std = [ "log/std", "scale-info/std", "sp-api?/std", + "sp-application-crypto/std", "sp-arithmetic/std", "sp-block-builder?/std", "sp-consensus-aura?/std", diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml index fcfc70c3ecda..7f8cf2ae86ae 100644 --- a/substrate/frame/authority-discovery/Cargo.toml +++ b/substrate/frame/authority-discovery/Cargo.toml @@ -24,8 +24,6 @@ frame = { workspace = true, features = ["experimental", "runtime"] } pallet-session = { features = [ "historical", ], workspace = true } -scale-info = { features = ["derive"], workspace = true } -sp-application-crypto = { workspace = true } sp-authority-discovery = { workspace = true } [features] @@ -35,7 +33,6 @@ std = [ "frame/std", "pallet-session/std", "scale-info/std", - "sp-application-crypto/std", "sp-authority-discovery/std", ] try-runtime = [ diff --git a/substrate/frame/authority-discovery/src/lib.rs b/substrate/frame/authority-discovery/src/lib.rs index b4fbdc9bb041..ddc1ec1ff775 100644 --- a/substrate/frame/authority-discovery/src/lib.rs +++ b/substrate/frame/authority-discovery/src/lib.rs @@ -26,10 +26,7 @@ extern crate alloc; use alloc::vec::Vec; -use frame::{ - prelude::*, - traits::{Get, OneSessionHandler}, -}; +use frame::prelude::*; use sp_authority_discovery::AuthorityId; pub use pallet::*; @@ -170,11 +167,10 @@ mod tests { use super::*; use crate as pallet_authority_discovery; use alloc::vec; - use frame::testing_prelude::* - use sp_application_crypto::Pair; + use frame::{testing_prelude::*, traits::OpaqueKeys}; use sp_authority_discovery::AuthorityPair; - type Block = frame_system::mocking::MockBlock; + type Block = MockBlock; construct_runtime!( pub enum Test diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs index c30e09b50212..4975a6fb86eb 100644 --- a/substrate/frame/src/lib.rs +++ b/substrate/frame/src/lib.rs @@ -224,15 +224,18 @@ pub mod prelude { pub use super::derive::*; /// All hashing related things - pub use super::hashing::*; + pub use super::cryptography::*; /// All arithmetic types and traits used for safe math. pub use super::arithmetic::*; + /// All account management related things. + pub use super::account::*; + /// Runtime traits #[doc(no_inline)] pub use sp_runtime::traits::{ - BlockNumberProvider, Bounded, Convert, DispatchInfoOf, Dispatchable, ReduceBy, + BlockNumberProvider, Bounded, Convert, ConvertInto, DispatchInfoOf, Dispatchable, ReduceBy, ReplaceWithDefault, SaturatedConversion, Saturating, StaticLookup, TrailingZeroInput, }; @@ -530,6 +533,17 @@ pub mod traits { pub use sp_runtime::traits::*; } +/// All account management related traits. +/// +/// This is already part of the [`prelude`]. +pub mod account { + pub use frame_support::traits::{ + AsEnsureOriginWithArg, ChangeMembers, EitherOfDiverse, FindAuthor, InitializeMembers, + }; + pub use sp_application_crypto::{KeyTypeId, Pair}; + pub use sp_runtime::traits::{IdentifyAccount, IdentityLookup}; +} + /// The arithmetic types used for safe math. /// /// This is already part of the [`prelude`]. @@ -551,8 +565,12 @@ pub mod derive { pub use sp_runtime::RuntimeDebug; } -pub mod hashing { - pub use sp_core::{hashing::*, H160, H256, H512, U256, U512}; +pub mod cryptography { + pub use sp_core::{ + crypto::{VrfPublic, VrfSecret, Wraps}, + hashing::*, + Pair, H160, H256, H512, U256, U512, + }; pub use sp_runtime::traits::{BlakeTwo256, Hash, Keccak256}; } @@ -582,6 +600,8 @@ pub mod deps { #[cfg(feature = "runtime")] pub use sp_api; #[cfg(feature = "runtime")] + pub use sp_application_crypto; + #[cfg(feature = "runtime")] pub use sp_block_builder; #[cfg(feature = "runtime")] pub use sp_consensus_aura; From cccfb0d089ecb361cf6a790eef5c421c0d2ac738 Mon Sep 17 00:00:00 2001 From: runcomet Date: Wed, 15 Jan 2025 23:25:31 +0100 Subject: [PATCH 6/9] taplo --- substrate/frame/authority-discovery/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml index 7f8cf2ae86ae..eef037e15c66 100644 --- a/substrate/frame/authority-discovery/Cargo.toml +++ b/substrate/frame/authority-discovery/Cargo.toml @@ -19,11 +19,11 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { features = [ "derive", ], workspace = true } -scale-info = { features = ["derive"], workspace = true } frame = { workspace = true, features = ["experimental", "runtime"] } pallet-session = { features = [ "historical", ], workspace = true } +scale-info = { features = ["derive"], workspace = true } sp-authority-discovery = { workspace = true } [features] From 86c220698714e18caf4af8f0dfdded345f21969e Mon Sep 17 00:00:00 2001 From: runcomet Date: Sun, 19 Jan 2025 12:49:42 +0100 Subject: [PATCH 7/9] remove experimental feature --- substrate/frame/authority-discovery/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml index eef037e15c66..cb192a806ce0 100644 --- a/substrate/frame/authority-discovery/Cargo.toml +++ b/substrate/frame/authority-discovery/Cargo.toml @@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { features = [ "derive", ], workspace = true } -frame = { workspace = true, features = ["experimental", "runtime"] } +frame = { workspace = true, features = ["runtime"] } pallet-session = { features = [ "historical", ], workspace = true } From a9e74f89a2b4baf2cc1528437cb9ada0e3f36535 Mon Sep 17 00:00:00 2001 From: runcomet Date: Mon, 20 Jan 2025 20:04:07 +0100 Subject: [PATCH 8/9] remove extra mod --- substrate/frame/src/lib.rs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs index 66bf81680f0e..3b4a3f823bcf 100644 --- a/substrate/frame/src/lib.rs +++ b/substrate/frame/src/lib.rs @@ -229,9 +229,6 @@ pub mod prelude { /// All arithmetic types and traits used for safe math. pub use super::arithmetic::*; - /// All account management related things. - pub use super::account::*; - /// Runtime traits #[doc(no_inline)] pub use sp_runtime::traits::{ @@ -574,16 +571,6 @@ pub mod cryptography { pub use sp_runtime::traits::{BlakeTwo256, Hash, Keccak256}; } -/// All account management related traits. -/// -/// This is already part of the [`prelude`]. -pub mod account { - pub use frame_support::traits::{ - AsEnsureOriginWithArg, ChangeMembers, EitherOfDiverse, InitializeMembers, - }; - pub use sp_runtime::traits::{IdentifyAccount, IdentityLookup}; -} - /// Access to all of the dependencies of this crate. In case the prelude re-exports are not enough, /// this module can be used. /// From 5c6ebd9529e3d6bf43079ae36f094155a7626931 Mon Sep 17 00:00:00 2001 From: runcomet Date: Sat, 25 Jan 2025 23:13:57 +0100 Subject: [PATCH 9/9] remoe crypto:Pair from umbrella --- substrate/frame/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs index 3b4a3f823bcf..70bdd5fd5ff1 100644 --- a/substrate/frame/src/lib.rs +++ b/substrate/frame/src/lib.rs @@ -566,7 +566,7 @@ pub mod cryptography { pub use sp_core::{ crypto::{VrfPublic, VrfSecret, Wraps}, hashing::*, - Pair, H160, H256, H512, U256, U512, + H160, H256, H512, U256, U512, }; pub use sp_runtime::traits::{BlakeTwo256, Hash, Keccak256}; }