Skip to content

Commit

Permalink
Remove dmp queue (#2726)
Browse files Browse the repository at this point in the history 
* wip

* remove dmp queue
  • Loading branch information
@xlc
xlc authored Mar 26, 2024
1 parent 3dd7630 commit 432100c
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 58 deletions.
23 changes: 0 additions & 23 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ orml-build-script-utils = { path = "orml/build-script-utils" }

# polkadot-sdk (wasm)
cumulus-pallet-aura-ext = { version = "0.7.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.7.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.7.0", default-features = false }
cumulus-pallet-xcm = { version = "0.7.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.7.0", default-features = false }
Expand Down
3 changes: 0 additions & 3 deletions runtime/acala/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ cumulus-primitives-core = { workspace = true }
cumulus-primitives-utility = { workspace = true }
cumulus-primitives-timestamp = { workspace = true }
cumulus-pallet-parachain-system = { workspace = true }
cumulus-pallet-dmp-queue = { workspace = true }
cumulus-pallet-xcmp-queue = { workspace = true }
cumulus-pallet-xcm = { workspace = true }
parachain-info = { workspace = true }
Expand Down Expand Up @@ -194,7 +193,6 @@ std = [
"substrate-wasm-builder",

"cumulus-pallet-aura-ext/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-xcm/std",
"cumulus-pallet-xcmp-queue/std",
Expand Down Expand Up @@ -351,7 +349,6 @@ try-runtime = [
"pallet-utility/try-runtime",

"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-dmp-queue/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
Expand Down
9 changes: 7 additions & 2 deletions runtime/acala/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,7 @@ construct_runtime!(
XcmpQueue: cumulus_pallet_xcmp_queue = 50,
PolkadotXcm: pallet_xcm = 51,
CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 52,
DmpQueue: cumulus_pallet_dmp_queue = 53,
// 53 was used by DmpQueue which is now replaced by MessageQueue
XTokens: orml_xtokens = 54,
UnknownTokens: orml_unknown_tokens = 55,
OrmlXcm: orml_xcm = 56,
Expand Down Expand Up @@ -1905,8 +1905,13 @@ pub type Executive = frame_executive::Executive<
Migrations,
>;

parameter_types! {
pub const DmpQueuePalletName: &'static str = "DmpQueue";
}

#[allow(unused_parens)]
type Migrations = (cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,);
type Migrations =
(frame_support::migrations::RemovePallet<DmpQueuePalletName, <Runtime as frame_system::Config>::DbWeight>,);

#[cfg(feature = "runtime-benchmarks")]
#[macro_use]
Expand Down
6 changes: 0 additions & 6 deletions runtime/acala/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
}

impl cumulus_pallet_dmp_queue::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight<Self>;
type DmpSink = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
}

parameter_types! {
pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
}
Expand Down
1 change: 0 additions & 1 deletion runtime/integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ cumulus-primitives-core = { workspace = true, features = ["std"] }
cumulus-primitives-utility = { workspace = true, features = ["std"] }
cumulus-primitives-timestamp = { workspace = true, features = ["std"] }
cumulus-pallet-parachain-system = { workspace = true, features = ["std"] }
cumulus-pallet-dmp-queue = { workspace = true, features = ["std"] }
cumulus-pallet-xcmp-queue = { workspace = true, features = ["std"] }
cumulus-pallet-xcm = { workspace = true, features = ["std"] }
parachain-info = { workspace = true, features = ["std"] }
Expand Down
3 changes: 0 additions & 3 deletions runtime/karura/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ cumulus-primitives-core = { workspace = true }
cumulus-primitives-utility = { workspace = true }
cumulus-primitives-timestamp = { workspace = true }
cumulus-pallet-parachain-system = { workspace = true }
cumulus-pallet-dmp-queue = { workspace = true }
cumulus-pallet-xcmp-queue = { workspace = true }
cumulus-pallet-xcm = { workspace = true }
parachain-info = { workspace = true }
Expand Down Expand Up @@ -195,7 +194,6 @@ std = [
"substrate-wasm-builder",

"cumulus-pallet-aura-ext/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-xcm/std",
"cumulus-pallet-xcmp-queue/std",
Expand Down Expand Up @@ -353,7 +351,6 @@ try-runtime = [
"pallet-utility/try-runtime",

"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-dmp-queue/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
Expand Down
9 changes: 7 additions & 2 deletions runtime/karura/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1797,7 +1797,7 @@ construct_runtime!(
XcmpQueue: cumulus_pallet_xcmp_queue = 50,
PolkadotXcm: pallet_xcm = 51,
CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 52,
DmpQueue: cumulus_pallet_dmp_queue = 53,
// 53 was used by DmpQueue which is now replaced by MessageQueue
XTokens: orml_xtokens = 54,
UnknownTokens: orml_unknown_tokens = 55,
OrmlXcm: orml_xcm = 56,
Expand Down Expand Up @@ -1909,8 +1909,13 @@ pub type Executive = frame_executive::Executive<
Migrations,
>;

parameter_types! {
pub const DmpQueuePalletName: &'static str = "DmpQueue";
}

#[allow(unused_parens)]
type Migrations = (cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,);
type Migrations =
(frame_support::migrations::RemovePallet<DmpQueuePalletName, <Runtime as frame_system::Config>::DbWeight>,);

#[cfg(feature = "runtime-benchmarks")]
#[macro_use]
Expand Down
6 changes: 0 additions & 6 deletions runtime/karura/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
}

impl cumulus_pallet_dmp_queue::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight<Self>;
type DmpSink = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
}

parameter_types! {
pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
}
Expand Down
3 changes: 0 additions & 3 deletions runtime/mandala/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ cumulus-primitives-core = { workspace = true }
cumulus-primitives-utility = { workspace = true }
cumulus-primitives-timestamp = { workspace = true }
cumulus-pallet-parachain-system = { workspace = true }
cumulus-pallet-dmp-queue = { workspace = true }
cumulus-pallet-xcmp-queue = { workspace = true }
cumulus-pallet-xcm = { workspace = true }
parachain-info = { workspace = true }
Expand Down Expand Up @@ -211,7 +210,6 @@ std = [
"substrate-wasm-builder",

"cumulus-pallet-aura-ext/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
"cumulus-pallet-xcm/std",
"cumulus-pallet-xcmp-queue/std",
Expand Down Expand Up @@ -383,7 +381,6 @@ try-runtime = [
"pallet-utility/try-runtime",

"cumulus-pallet-aura-ext/try-runtime",
"cumulus-pallet-dmp-queue/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
Expand Down
4 changes: 2 additions & 2 deletions runtime/mandala/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@ pub type Executive = frame_executive::Executive<
>;

#[allow(unused_parens)]
type Migrations = (cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,);
type Migrations = ();

construct_runtime!(
pub enum Runtime {
Expand Down Expand Up @@ -2080,7 +2080,7 @@ construct_runtime!(
XcmpQueue: cumulus_pallet_xcmp_queue = 170,
PolkadotXcm: pallet_xcm = 171,
CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 172,
DmpQueue: cumulus_pallet_dmp_queue = 173,
// DmpQueue is removed
XTokens: orml_xtokens = 174,
UnknownTokens: orml_unknown_tokens = 175,
OrmlXcm: orml_xcm = 176,
Expand Down
6 changes: 0 additions & 6 deletions runtime/mandala/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
}

impl cumulus_pallet_dmp_queue::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight<Self>;
type DmpSink = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
}

parameter_types! {
pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
}
Expand Down

0 comments on commit 432100c

Please sign in to comment.