rename getXcAssetIdByAssetId to getXcAssetMultiLocationByAssetId

paritytech · Nov 11, 2023 · 4861ee4 · 4861ee4
1 parent b3ba209
commit 4861ee4
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 12 deletions.
diff --git a/src/createXcmTypes/ParaToPara.ts b/src/createXcmTypes/ParaToPara.ts
@@ -30,7 +30,7 @@ import type {
 import { constructForeignAssetMultiLocationFromAssetId } from './util/constructForeignAssetMultiLocationFromAssetId';
 import { dedupeMultiAssets } from './util/dedupeMultiAssets';
 import { fetchPalletInstanceId } from './util/fetchPalletInstanceId';
-import { getXcAssetIdByAssetId } from './util/getXcAssetIdByAssetId';
+import { getXcAssetMultiLocationByAssetId } from './util/getXcAssetMultiLocationByAssetId';
 import { isParachainPrimaryNativeAsset } from './util/isParachainPrimaryNativeAsset';
 import { sortMultiAssetsAscending } from './util/sortMultiAssetsAscending';
 
@@ -262,7 +262,13 @@ export const ParaToPara: ICreateXcmType = {
 	): Promise<UnionXcAssetsMultiAsset> => {
 		const { registry, api } = opts;
 
-		const xcAssetMultiLocationStr = await getXcAssetIdByAssetId(api, assetId, specName, xcmVersion, registry);
+		const xcAssetMultiLocationStr = await getXcAssetMultiLocationByAssetId(
+			api,
+			assetId,
+			specName,
+			xcmVersion,
+			registry
+		);
 		const parsedMultiLocation = JSON.parse(xcAssetMultiLocationStr) as XCMAssetRegistryMultiLocation;
 		const xcAssetMultiLocation = parsedMultiLocation.v1 as unknown as AnyJson;
 
@@ -340,7 +346,13 @@ const createXTokensMultiAssets = async (
 		const amount = amounts[i];
 		const assetId = assets[i];
 
-		const xcAssetMultiLocationStr = await getXcAssetIdByAssetId(api, assetId, specName, xcmVersion, registry);
+		const xcAssetMultiLocationStr = await getXcAssetMultiLocationByAssetId(
+			api,
+			assetId,
+			specName,
+			xcmVersion,
+			registry
+		);
 		const parsedMultiLocation = JSON.parse(xcAssetMultiLocationStr) as XCMAssetRegistryMultiLocation;
 		const xcAssetMultiLocation = parsedMultiLocation.v1 as unknown as AnyJson;
 
@@ -425,7 +437,13 @@ const createParaToParaMultiAssets = async (
 			const amount = amounts[i];
 			const assetId = assets[i];
 
-			const xcAssetMultiLocationStr = await getXcAssetIdByAssetId(api, assetId, specName, xcmVersion, registry);
+			const xcAssetMultiLocationStr = await getXcAssetMultiLocationByAssetId(
+				api,
+				assetId,
+				specName,
+				xcmVersion,
+				registry
+			);
 			const parsedMultiLocation = JSON.parse(xcAssetMultiLocationStr) as XCMAssetRegistryMultiLocation;
 			const xcAssetMultiLocation = parsedMultiLocation.v1 as unknown as AnyJson;
 

diff --git a/src/createXcmTypes/ParaToSystem.ts b/src/createXcmTypes/ParaToSystem.ts
@@ -29,7 +29,7 @@ import type {
 import { constructForeignAssetMultiLocationFromAssetId } from './util/constructForeignAssetMultiLocationFromAssetId';
 import { dedupeMultiAssets } from './util/dedupeMultiAssets';
 import { fetchPalletInstanceId } from './util/fetchPalletInstanceId';
-import { getXcAssetIdByAssetId } from './util/getXcAssetIdByAssetId';
+import { getXcAssetMultiLocationByAssetId } from './util/getXcAssetMultiLocationByAssetId';
 import { isParachainPrimaryNativeAsset } from './util/isParachainPrimaryNativeAsset';
 import { sortMultiAssetsAscending } from './util/sortMultiAssetsAscending';
 
@@ -249,7 +249,13 @@ export const ParaToSystem: ICreateXcmType = {
 	): Promise<UnionXcAssetsMultiAsset> => {
 		const { registry, api } = opts;
 
-		const xcAssetMultiLocationStr = await getXcAssetIdByAssetId(api, assetId, specName, xcmVersion, registry);
+		const xcAssetMultiLocationStr = await getXcAssetMultiLocationByAssetId(
+			api,
+			assetId,
+			specName,
+			xcmVersion,
+			registry
+		);
 		const parsedMultiLocation = JSON.parse(xcAssetMultiLocationStr) as XCMAssetRegistryMultiLocation;
 		const xcAssetMultiLocation = parsedMultiLocation.v1 as unknown as AnyJson;
 
@@ -326,7 +332,13 @@ const createXTokensMultiAssets = async (
 		const amount = amounts[i];
 		const assetId = assets[i];
 
-		const xcAssetMultiLocationStr = await getXcAssetIdByAssetId(api, assetId, specName, xcmVersion, registry);
+		const xcAssetMultiLocationStr = await getXcAssetMultiLocationByAssetId(
+			api,
+			assetId,
+			specName,
+			xcmVersion,
+			registry
+		);
 		const parsedMultiLocation = JSON.parse(xcAssetMultiLocationStr) as XCMAssetRegistryMultiLocation;
 		const xcAssetMultiLocation = parsedMultiLocation.v1 as unknown as AnyJson;
 
@@ -410,7 +422,13 @@ const createParaToSystemMultiAssets = async (
 			const amount = amounts[i];
 			const assetId = assets[i];
 
-			const xcAssetMultiLocationStr = await getXcAssetIdByAssetId(api, assetId, specName, xcmVersion, registry);
+			const xcAssetMultiLocationStr = await getXcAssetMultiLocationByAssetId(
+				api,
+				assetId,
+				specName,
+				xcmVersion,
+				registry
+			);
 			const parsedMultiLocation = JSON.parse(xcAssetMultiLocationStr) as XCMAssetRegistryMultiLocation;
 			const xcAssetMultiLocation = parsedMultiLocation.v1 as unknown as AnyJson;
 

diff --git a/...mTypes/util/getXcAssetIdByAssetId.spec.ts → .../getXcAssetMultiLocationByAssetId.spec.ts b/...mTypes/util/getXcAssetIdByAssetId.spec.ts → .../getXcAssetMultiLocationByAssetId.spec.ts
@@ -4,7 +4,7 @@ import { AssetTransferApi } from '../../AssetTransferApi';
 import { Registry } from '../../registry';
 import { adjustedMockBifrostParachainApi } from '../../testHelpers/adjustedMockBifrostParachainApi';
 import { adjustedMockMoonriverParachainApi } from '../../testHelpers/adjustedMockMoonriverParachainApi';
-import { getXcAssetIdByAssetId } from './getXcAssetIdByAssetId';
+import { getXcAssetMultiLocationByAssetId } from './getXcAssetMultiLocationByAssetId';
 
 const bifrostRegistry = new Registry('bifrost', {});
 const bifrostApi = new AssetTransferApi(adjustedMockBifrostParachainApi, 'bifrost', 3);
@@ -42,7 +42,13 @@ describe('getXcAssetByAssetId', () => {
 
 		const expected =
 			'{"v1":{"parents":1,"interior":{"x3":[{"parachain":1000},{"palletInstance":50},{"generalIndex":1984}]}}}';
-		const result = await getXcAssetIdByAssetId(bifrostApi._api, assetId, specName, xcmVersion, bifrostRegistry);
+		const result = await getXcAssetMultiLocationByAssetId(
+			bifrostApi._api,
+			assetId,
+			specName,
+			xcmVersion,
+			bifrostRegistry
+		);
 
 		expect(result).toStrictEqual(expected);
 	});
@@ -69,7 +75,13 @@ describe('getXcAssetByAssetId', () => {
 		const specName = 'moonriver';
 
 		const expected = '{"v1":{"parents":1,"interior":{"x2":[{"parachain":2001},{"generalKey":"0x010a"}]}}}';
-		const result = await getXcAssetIdByAssetId(moonriverApi._api, assetId, specName, xcmVersion, moonriverRegistry);
+		const result = await getXcAssetMultiLocationByAssetId(
+			moonriverApi._api,
+			assetId,
+			specName,
+			xcmVersion,
+			moonriverRegistry
+		);
 
 		expect(result).toStrictEqual(expected);
 	});

diff --git a/...ateXcmTypes/util/getXcAssetIdByAssetId.ts → .../util/getXcAssetMultiLocationByAssetId.ts b/...ateXcmTypes/util/getXcAssetIdByAssetId.ts → .../util/getXcAssetMultiLocationByAssetId.ts
@@ -7,7 +7,7 @@ import type { SanitizedXcAssetsData } from '../../registry/types';
 import { validateNumber } from '../../validate';
 import { getAssetId } from './getAssetId';
 
-export const getXcAssetIdByAssetId = async (
+export const getXcAssetMultiLocationByAssetId = async (
 	api: ApiPromise,
 	assetId: string,
 	specName: string,