diff --git a/parachain/Cargo.lock b/parachain/Cargo.lock index 4646505d2c..0cc71822c9 100644 --- a/parachain/Cargo.lock +++ b/parachain/Cargo.lock @@ -3145,6 +3145,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "polkadot-parachain-primitives", "polkadot-primitives", "rustc-hex", "scale-info", diff --git a/parachain/primitives/core/Cargo.toml b/parachain/primitives/core/Cargo.toml index dece918e92..371f19bcee 100644 --- a/parachain/primitives/core/Cargo.toml +++ b/parachain/primitives/core/Cargo.toml @@ -12,6 +12,7 @@ scale-info = { version = "2.9.0", default-features = false, features = [ "derive snowbridge-ethereum = { path = "../ethereum", default-features = false } polkadot-primitives = { path = "../../../polkadot-sdk/polkadot/primitives", default-features = false } +polkadot-parachain-primitives = { path = "../../../polkadot-sdk/polkadot/parachain", default-features = false } xcm = { package = "staging-xcm", path = "../../../polkadot-sdk/polkadot/xcm", default-features = false } frame-support = { path = "../../../polkadot-sdk/substrate/frame/support", default-features = false } @@ -35,6 +36,7 @@ std = [ "frame-support/std", "frame-system/std", "polkadot-primitives/std", + "polkadot-parachain-primitives/std", "sp-std/std", "sp-core/std", "sp-runtime/std", diff --git a/parachain/primitives/core/src/inbound.rs b/parachain/primitives/core/src/inbound.rs index b28df72ed7..5e7b10c25b 100644 --- a/parachain/primitives/core/src/inbound.rs +++ b/parachain/primitives/core/src/inbound.rs @@ -3,9 +3,10 @@ //! Types for representing inbound messages use codec::{Decode, Encode}; -use frame_support::{dispatch::DispatchError, scale_info::TypeInfo, RuntimeDebug}; +use scale_info::TypeInfo; use snowbridge_ethereum::Log; use sp_core::H256; +use sp_runtime::{DispatchError, RuntimeDebug}; use sp_std::vec::Vec; /// A trait for verifying inbound messages from Ethereum. diff --git a/parachain/primitives/core/src/lib.rs b/parachain/primitives/core/src/lib.rs index e952f61e2e..8be5f48e42 100644 --- a/parachain/primitives/core/src/lib.rs +++ b/parachain/primitives/core/src/lib.rs @@ -12,7 +12,8 @@ pub mod inbound; pub mod outbound; pub mod ringbuffer; -pub use polkadot_parachain::primitives::{Id as ParaId, IsSystem}; +pub use polkadot_parachain_primitives::primitives::IsSystem; +pub use polkadot_primitives::Id as ParaId; pub use ringbuffer::{RingBufferMap, RingBufferMapImpl}; use sp_core::H256; diff --git a/parachain/primitives/core/src/outbound.rs b/parachain/primitives/core/src/outbound.rs index 4dd6e7a199..8ed2462dc1 100644 --- a/parachain/primitives/core/src/outbound.rs +++ b/parachain/primitives/core/src/outbound.rs @@ -5,7 +5,7 @@ use frame_support::{ traits::{tokens::Balance, Get}, BoundedVec, CloneNoBound, DebugNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, }; -pub use polkadot_parachain::primitives::Id as ParaId; +pub use polkadot_primitives::Id as ParaId; use scale_info::TypeInfo; use sp_core::{RuntimeDebug, H160, H256, U256}; use sp_std::{borrow::ToOwned, vec, vec::Vec};