Replace V4V3LocationConverter with WithLatestLocationConverter

moonbeam-foundation · Jun 6, 2024 · 3d6525b · 3d6525b
1 parent 1c738d3
commit 3d6525b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/runtime/moonbase/src/xcm_config.rs b/runtime/moonbase/src/xcm_config.rs
@@ -480,7 +480,7 @@ impl Into<Option<xcm::v3::Location>> for AssetType {
 impl Into<Option<Location>> for AssetType {
 	fn into(self) -> Option<Location> {
 		match self {
-			Self::Xcm(location) => xcm_builder::V4V3LocationConverter::convert_back(&location),
+			Self::Xcm(location) => xcm_builder::WithLatestLocationConverter::convert_back(&location),
 		}
 	}
 }
@@ -704,7 +704,7 @@ impl pallet_erc20_xcm_bridge::Config for Runtime {
 #[cfg(feature = "runtime-benchmarks")]
 mod testing {
 	use super::*;
-	use xcm_builder::V4V3LocationConverter;
+	use xcm_builder::WithLatestLocationConverter;
 
 	/// This From exists for benchmarking purposes. It has the potential side-effect of calling
 	/// AssetManager::set_asset_type_asset_id() and should NOT be used in any production code.
@@ -719,7 +719,7 @@ mod testing {
 				asset_id
 			} else {
 				let asset_type = AssetType::Xcm(
-					V4V3LocationConverter::convert(&location).expect("convert to v3"),
+					WithLatestLocationConverter::convert(&location).expect("convert to v3"),
 				);
 				let asset_id: AssetId = asset_type.clone().into();
 				AssetManager::set_asset_type_asset_id(asset_type, asset_id);

diff --git a/runtime/moonbeam/src/xcm_config.rs b/runtime/moonbeam/src/xcm_config.rs
@@ -458,7 +458,7 @@ impl Into<Option<xcm::v3::Location>> for AssetType {
 impl Into<Option<Location>> for AssetType {
 	fn into(self) -> Option<Location> {
 		match self {
-			Self::Xcm(location) => xcm_builder::V4V3LocationConverter::convert_back(&location),
+			Self::Xcm(location) => xcm_builder::WithLatestLocationConverter::convert_back(&location),
 		}
 	}
 }
@@ -681,7 +681,7 @@ impl pallet_erc20_xcm_bridge::Config for Runtime {
 #[cfg(feature = "runtime-benchmarks")]
 mod testing {
 	use super::*;
-	use xcm_builder::V4V3LocationConverter;
+	use xcm_builder::WithLatestLocationConverter;
 
 	/// This From exists for benchmarking purposes. It has the potential side-effect of calling
 	/// AssetManager::set_asset_type_asset_id() and should NOT be used in any production code.
@@ -696,7 +696,7 @@ mod testing {
 				asset_id
 			} else {
 				let asset_type = AssetType::Xcm(
-					V4V3LocationConverter::convert(&location).expect("convert to v3"),
+					WithLatestLocationConverter::convert(&location).expect("convert to v3"),
 				);
 				let asset_id: AssetId = asset_type.clone().into();
 				AssetManager::set_asset_type_asset_id(asset_type, asset_id);

diff --git a/runtime/moonriver/src/xcm_config.rs b/runtime/moonriver/src/xcm_config.rs
@@ -466,7 +466,7 @@ impl Into<Option<xcm::v3::Location>> for AssetType {
 impl Into<Option<Location>> for AssetType {
 	fn into(self) -> Option<Location> {
 		match self {
-			Self::Xcm(location) => xcm_builder::V4V3LocationConverter::convert_back(&location),
+			Self::Xcm(location) => xcm_builder::WithLatestLocationConverter::convert_back(&location),
 		}
 	}
 }
@@ -694,7 +694,7 @@ impl pallet_erc20_xcm_bridge::Config for Runtime {
 #[cfg(feature = "runtime-benchmarks")]
 mod testing {
 	use super::*;
-	use xcm_builder::V4V3LocationConverter;
+	use xcm_builder::WithLatestLocationConverter;
 
 	/// This From exists for benchmarking purposes. It has the potential side-effect of calling
 	/// AssetManager::set_asset_type_asset_id() and should NOT be used in any production code.
@@ -709,7 +709,7 @@ mod testing {
 				asset_id
 			} else {
 				let asset_type = AssetType::Xcm(
-					V4V3LocationConverter::convert(&location).expect("convert to v3"),
+					WithLatestLocationConverter::convert(&location).expect("convert to v3"),
 				);
 				let asset_id: AssetId = asset_type.clone().into();
 				AssetManager::set_asset_type_asset_id(asset_type, asset_id);