From ec61396ec8315989f6df33253ccff5445e99f848 Mon Sep 17 00:00:00 2001
From: Adrian Catangiu <adrian@parity.io>
Date: Tue, 5 Nov 2024 12:25:51 +0200
Subject: [PATCH] Remove leftover references of Wococo (#6361)
Remove references of now defunct Wococo network.
The XCM `NetworkId::Wococo` will also be removed with [XCMv5
PR](https://github.com/paritytech/polkadot-sdk/pull/4826)
---
bridges/primitives/messages/src/lane.rs | 4 ++--
.../parachains/runtimes/assets/common/src/matching.rs | 10 +++++-----
polkadot/cli/src/cli.rs | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bridges/primitives/messages/src/lane.rs b/bridges/primitives/messages/src/lane.rs
index 0f14ce93e11..75237a44d53 100644
--- a/bridges/primitives/messages/src/lane.rs
+++ b/bridges/primitives/messages/src/lane.rs
@@ -108,8 +108,8 @@ impl TypeId for LegacyLaneId {
/// concatenation (separated by some binary data). I.e.:
///
/// ```nocompile
-/// let endpoint1 = X2(GlobalConsensus(NetworkId::Rococo), Parachain(42));
-/// let endpoint2 = X2(GlobalConsensus(NetworkId::Wococo), Parachain(777));
+/// let endpoint1 = X2(GlobalConsensus(NetworkId::Polkadot), Parachain(42));
+/// let endpoint2 = X2(GlobalConsensus(NetworkId::Kusama), Parachain(777));
///
/// let final_lane_key = if endpoint1 < endpoint2 {
/// (endpoint1, VALUES_SEPARATOR, endpoint2)
diff --git a/cumulus/parachains/runtimes/assets/common/src/matching.rs b/cumulus/parachains/runtimes/assets/common/src/matching.rs
index 9ac2056a67f..5a452f6eed1 100644
--- a/cumulus/parachains/runtimes/assets/common/src/matching.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/matching.rs
@@ -149,7 +149,7 @@ mod tests {
parameter_types! {
pub UniversalLocation: InteriorLocation = [GlobalConsensus(Rococo), Parachain(1000)].into();
- pub ExpectedNetworkId: NetworkId = Wococo;
+ pub ExpectedNetworkId: NetworkId = Westend;
}
#[test]
@@ -158,13 +158,13 @@ mod tests {
let asset: Location = (
Parent,
Parent,
- GlobalConsensus(Wococo),
+ GlobalConsensus(Westend),
Parachain(1000),
PalletInstance(1),
GeneralIndex(1),
)
.into();
- let origin: Location = (Parent, Parent, GlobalConsensus(Wococo), Parachain(1000)).into();
+ let origin: Location = (Parent, Parent, GlobalConsensus(Westend), Parachain(1000)).into();
assert!(FromNetwork::<UniversalLocation, ExpectedNetworkId>::contains(&asset, &origin));
// asset and origin from local consensus fails
@@ -195,14 +195,14 @@ mod tests {
GeneralIndex(1),
)
.into();
- let origin: Location = (Parent, Parent, GlobalConsensus(Wococo), Parachain(1000)).into();
+ let origin: Location = (Parent, Parent, GlobalConsensus(Westend), Parachain(1000)).into();
assert!(!FromNetwork::<UniversalLocation, ExpectedNetworkId>::contains(&asset, &origin));
// origin from different consensus fails
let asset: Location = (
Parent,
Parent,
- GlobalConsensus(Wococo),
+ GlobalConsensus(Westend),
Parachain(1000),
PalletInstance(1),
GeneralIndex(1),
diff --git a/polkadot/cli/src/cli.rs b/polkadot/cli/src/cli.rs
index eb67a395634..777bb9c6067 100644
--- a/polkadot/cli/src/cli.rs
+++ b/polkadot/cli/src/cli.rs
@@ -79,7 +79,7 @@ pub struct RunCmd {
/// Disable the BEEFY gadget.
///
- /// Currently enabled by default on 'Rococo', 'Wococo' and 'Versi'.
+ /// Currently enabled by default.
#[arg(long)]
pub no_beefy: bool,
--
GitLab