From aea4428c5105929db48bee603fecd0552135de0c Mon Sep 17 00:00:00 2001 From: claravanstaden Date: Wed, 10 Jan 2024 09:38:28 +0200 Subject: [PATCH] renames inbound queue pallet --- Cargo.lock | 10 +++++----- .../parachains/bridges/bridge-hub-rococo/Cargo.toml | 2 +- .../tests/bridges/bridge-hub-rococo/Cargo.toml | 2 +- .../runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml | 8 ++++---- .../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 10 +++++----- .../bridge-hubs/bridge-hub-rococo/src/weights/mod.rs | 2 +- ...und_queue.rs => snowbridge_inbound_queue_pallet.rs} | 6 +++--- .../bridge-hubs/bridge-hub-rococo/src/xcm_config.rs | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/{snowbridge_inbound_queue.rs => snowbridge_inbound_queue_pallet.rs} (92%) diff --git a/Cargo.lock b/Cargo.lock index e03dc713dacb..4f003a89e289 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1951,7 +1951,7 @@ dependencies = [ "parachains-common", "serde_json", "snowbridge-core", - "snowbridge-inbound-queue", + "snowbridge-inbound-queue-pallet", "snowbridge-outbound-queue", "snowbridge-router-primitives", "snowbridge-system", @@ -1985,7 +1985,7 @@ dependencies = [ "rococo-westend-system-emulated-network", "scale-info", "snowbridge-core", - "snowbridge-inbound-queue", + "snowbridge-inbound-queue-pallet", "snowbridge-outbound-queue", "snowbridge-rococo-common", "snowbridge-router-primitives", @@ -2063,7 +2063,7 @@ dependencies = [ "snowbridge-beacon-primitives", "snowbridge-core", "snowbridge-ethereum-client-pallet", - "snowbridge-inbound-queue", + "snowbridge-inbound-queue-pallet", "snowbridge-outbound-queue", "snowbridge-outbound-queue-runtime-api", "snowbridge-rococo-common", @@ -17343,7 +17343,7 @@ dependencies = [ ] [[package]] -name = "snowbridge-inbound-queue" +name = "snowbridge-inbound-queue-pallet" version = "0.9.0" dependencies = [ "alloy-primitives", @@ -17511,7 +17511,7 @@ dependencies = [ "snowbridge-beacon-primitives", "snowbridge-core", "snowbridge-ethereum-client-pallet", - "snowbridge-inbound-queue", + "snowbridge-inbound-queue-pallet", "snowbridge-outbound-queue", "snowbridge-outbound-queue-runtime-api", "snowbridge-router-primitives", diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml index 999df560996a..71fe136bb8bd 100644 --- a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml @@ -31,5 +31,5 @@ bridge-hub-common = { path = "../../../../../../runtimes/bridge-hubs/common", de snowbridge-core = { path = "../../../../../../../../../parachain/primitives/core", default-features = false } snowbridge-router-primitives = { path = "../../../../../../../../../parachain/primitives/router", default-features = false } snowbridge-system = { path = "../../../../../../../../../parachain/pallets/system", default-features = false } -snowbridge-inbound-queue = { path = "../../../../../../../../../parachain/pallets/inbound-queue", default-features = false } +snowbridge-inbound-queue-pallet = { path = "../../../../../../../../../parachain/pallets/inbound-queue", default-features = false } snowbridge-outbound-queue = { path = "../../../../../../../../../parachain/pallets/outbound-queue", default-features = false } diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml index ba31cf68b56f..be09e8cbad37 100644 --- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml @@ -49,6 +49,6 @@ asset-hub-rococo-runtime = { path = "../../../../../runtimes/assets/asset-hub-ro snowbridge-core = { path = "../../../../../../../../parachain/primitives/core", default-features = false } snowbridge-router-primitives = { path = "../../../../../../../../parachain/primitives/router", default-features = false } snowbridge-system = { path = "../../../../../../../../parachain/pallets/system", default-features = false } -snowbridge-inbound-queue = { path = "../../../../../../../../parachain/pallets/inbound-queue", default-features = false } +snowbridge-inbound-queue-pallet = { path = "../../../../../../../../parachain/pallets/inbound-queue", default-features = false } snowbridge-outbound-queue = { path = "../../../../../../../../parachain/pallets/outbound-queue", default-features = false } snowbridge-rococo-common = { path = "../../../../../../../../parachain/runtime/rococo-common", default-features = false } diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml index ab016cb96e6b..760fc4b91e32 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml @@ -112,7 +112,7 @@ snowbridge-system = { path = "../../../../../../parachain/pallets/system", defau snowbridge-system-runtime-api = { path = "../../../../../../parachain/pallets/system/runtime-api", default-features = false } snowbridge-core = { path = "../../../../../../parachain/primitives/core", default-features = false } snowbridge-ethereum-client-pallet = { path = "../../../../../../parachain/pallets/ethereum-client", default-features = false } -snowbridge-inbound-queue = { path = "../../../../../../parachain/pallets/inbound-queue", default-features = false } +snowbridge-inbound-queue-pallet = { path = "../../../../../../parachain/pallets/inbound-queue", default-features = false } snowbridge-outbound-queue = { path = "../../../../../../parachain/pallets/outbound-queue", default-features = false } snowbridge-outbound-queue-runtime-api = { path = "../../../../../../parachain/pallets/outbound-queue/runtime-api", default-features = false } snowbridge-router-primitives = { path = "../../../../../../parachain/primitives/router", default-features = false } @@ -194,7 +194,7 @@ std = [ "snowbridge-beacon-primitives/std", "snowbridge-core/std", "snowbridge-ethereum-client-pallet/std", - "snowbridge-inbound-queue/std", + "snowbridge-inbound-queue-pallet/std", "snowbridge-outbound-queue-runtime-api/std", "snowbridge-outbound-queue/std", "snowbridge-rococo-common/std", @@ -253,7 +253,7 @@ runtime-benchmarks = [ "polkadot-runtime-common/runtime-benchmarks", "snowbridge-core/runtime-benchmarks", "snowbridge-ethereum-client-pallet/runtime-benchmarks", - "snowbridge-inbound-queue/runtime-benchmarks", + "snowbridge-inbound-queue-pallet/runtime-benchmarks", "snowbridge-outbound-queue/runtime-benchmarks", "snowbridge-rococo-common/runtime-benchmarks", "snowbridge-router-primitives/runtime-benchmarks", @@ -293,7 +293,7 @@ try-runtime = [ "parachain-info/try-runtime", "polkadot-runtime-common/try-runtime", "snowbridge-ethereum-client-pallet/try-runtime", - "snowbridge-inbound-queue/try-runtime", + "snowbridge-inbound-queue-pallet/try-runtime", "snowbridge-outbound-queue/try-runtime", "snowbridge-system/try-runtime", "sp-runtime/try-runtime", diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 21073a9eb94f..be9582ff97d3 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -515,7 +515,7 @@ pub mod benchmark_helpers { use crate::{EthereumBeaconClient, Runtime, RuntimeOrigin}; use codec::Encode; use snowbridge_beacon_primitives::CompactExecutionHeader; - use snowbridge_inbound_queue::BenchmarkHelper; + use snowbridge_inbound_queue_pallet::BenchmarkHelper; use sp_core::H256; use xcm::latest::{MultiAssets, MultiLocation, SendError, SendResult, SendXcm, Xcm, XcmHash}; @@ -548,7 +548,7 @@ pub mod benchmark_helpers { } } -impl snowbridge_inbound_queue::Config for Runtime { +impl snowbridge_inbound_queue_pallet::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Verifier = snowbridge_ethereum_client_pallet::Pallet; type Token = Balances; @@ -570,7 +570,7 @@ impl snowbridge_inbound_queue::Config for Runtime { type WeightToFee = WeightToFee; type LengthToFee = ConstantMultiplier; type MaxMessageSize = ConstU32<2048>; - type WeightInfo = weights::snowbridge_inbound_queue::WeightInfo; + type WeightInfo = weights::snowbridge_inbound_queue_pallet::WeightInfo; type PricingParameters = EthereumSystem; type AssetTransactor = ::AssetTransactor; } @@ -718,7 +718,7 @@ construct_runtime!( // With-Rococo Bulletin bridge hub pallet. XcmOverPolkadotBulletin: pallet_xcm_bridge_hub::::{Pallet} = 62, - EthereumInboundQueue: snowbridge_inbound_queue::{Pallet, Call, Storage, Event} = 80, + EthereumInboundQueue: snowbridge_inbound_queue_pallet::{Pallet, Call, Storage, Event} = 80, EthereumOutboundQueue: snowbridge_outbound_queue::{Pallet, Call, Storage, Event} = 81, EthereumBeaconClient: snowbridge_ethereum_client_pallet::{Pallet, Call, Storage, Event} = 82, EthereumSystem: snowbridge_system::{Pallet, Call, Storage, Config, Event} = 83, @@ -773,7 +773,7 @@ mod benches { [pallet_bridge_messages, RococoToRococoBulletin] [pallet_bridge_relayers, BridgeRelayersBench::] // Ethereum Bridge - [snowbridge_inbound_queue, EthereumInboundQueue] + [snowbridge_inbound_queue_pallet, EthereumInboundQueue] [snowbridge_outbound_queue, EthereumOutboundQueue] [snowbridge_system, EthereumSystem] [snowbridge_ethereum_client_pallet, EthereumBeaconClient] diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs index 2d9ab9361536..c344fe6cce64 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs @@ -41,7 +41,7 @@ pub mod pallet_xcm; pub mod paritydb_weights; pub mod rocksdb_weights; pub mod snowbridge_ethereum_client_pallet; -pub mod snowbridge_inbound_queue; +pub mod snowbridge_inbound_queue_pallet; pub mod snowbridge_outbound_queue; pub mod snowbridge_system; pub mod xcm; diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_inbound_queue.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_inbound_queue_pallet.rs similarity index 92% rename from cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_inbound_queue.rs rename to cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_inbound_queue_pallet.rs index f734227a4111..de1ac41ef2e5 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_inbound_queue.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/snowbridge_inbound_queue_pallet.rs @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -//! Autogenerated weights for `snowbridge_inbound_queue` +//! Autogenerated weights for `snowbridge_inbound_queue_pallet` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev //! DATE: 2023-09-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` @@ -45,9 +45,9 @@ use frame_support::{traits::Get, weights::Weight}; use core::marker::PhantomData; -/// Weight functions for `snowbridge_inbound_queue`. +/// Weight functions for `snowbridge_inbound_queue_pallet`. pub struct WeightInfo(PhantomData); -impl snowbridge_inbound_queue::WeightInfo for WeightInfo { +impl snowbridge_inbound_queue_pallet::WeightInfo for WeightInfo { /// Storage: EthereumInboundQueue PalletOperatingMode (r:1 w:0) /// Proof: EthereumInboundQueue PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: EthereumBeaconClient ExecutionHeaders (r:1 w:0) diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs index 04ce02b185f6..7ca6c6728763 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs @@ -224,7 +224,7 @@ impl Contains for SafeCallFilter { snowbridge_ethereum_client_pallet::Call::force_checkpoint { .. } | snowbridge_ethereum_client_pallet::Call::set_operating_mode { .. }, ) | RuntimeCall::EthereumInboundQueue( - snowbridge_inbound_queue::Call::set_operating_mode { .. }, + snowbridge_inbound_queue_pallet::Call::set_operating_mode { .. }, ) | RuntimeCall::EthereumOutboundQueue( snowbridge_outbound_queue::Call::set_operating_mode { .. }, ) | RuntimeCall::EthereumSystem(..)