feat: fix adapter of host data.

logion-network/logion-internal#488
logion-network · Mar 4, 2024 · e73dfd6 · e73dfd6
1 parent bf543ef
commit e73dfd6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 6 deletions.
diff --git a/packages/node-api/integration/LoAuthorityList.ts b/packages/node-api/integration/LoAuthorityList.ts
@@ -1,4 +1,4 @@
-import { ALICE, DAVE, setup, signAndSend } from "./Util.js";
+import { ALICE, DAVE, FERDIE, setup, signAndSend } from "./Util.js";
 
 export async function addGuestLegalOfficer() {
     const { alice, api } = await setup();
@@ -47,3 +47,22 @@ export async function getAvailableRegions() {
     const regions = api.queries.getAvailableRegions();
     expect(regions).toContain(defaultRegion);
 }
+
+export async function importHost() {
+    const { api, alice } = await setup();
+    const nodeId = "12D3KooWDh3ZkezHgdC1A7MB32m43HHsGPDy1aGoA3svhN4Z8qYt";
+    const baseUrl = "https://some-node.logion.network";
+    const region = "Europe";
+    const extrinsic = api.polkadot.tx.loAuthorityList.importHostLegalOfficer(FERDIE, {
+        nodeId,
+        baseUrl,
+        region,
+    });
+    const sudoExtrinsic = api.polkadot.tx.sudo.sudo(extrinsic);
+    await signAndSend(alice, sudoExtrinsic);
+
+    const host = await api.queries.getLegalOfficerData(FERDIE);
+    expect(host.hostData?.nodeId).toBe(nodeId);
+    expect(host.hostData?.baseUrl).toBe(baseUrl);
+    expect(host.hostData?.region).toBe(region);
+}
diff --git a/packages/node-api/integration/Main.spec.ts b/packages/node-api/integration/Main.spec.ts
@@ -4,7 +4,7 @@ import {
     closeCollectionLocTest,
     createCollectionLocLimitedInSizeTest
 } from "./CollectionLoc.js";
-import { addGuestLegalOfficer, getAvailableRegions, updateHostLegalOfficer } from "./LoAuthorityList.js";
+import { addGuestLegalOfficer, getAvailableRegions, importHost, updateHostLegalOfficer } from "./LoAuthorityList.js";
 import {
     createTransactionLocTest,
     addMetadataToTransactionLocTestAsLLO,
@@ -70,6 +70,7 @@ describe("Logion Node API", () => {
     it("adds guest legal offier", addGuestLegalOfficer);
     it("updates host legal offier", updateHostLegalOfficer);
     it("provides available regions", getAvailableRegions);
+    it("imports host legal officer", importHost);
 
     it("supports verified issuers", verifiedIssuers);
     it("supports invited contributors", invitedContributors);

diff --git a/packages/node-api/integration/Util.ts b/packages/node-api/integration/Util.ts
@@ -55,6 +55,8 @@ const INVITED_CONTRIBUTOR_SECRET_SEED = "october minimum future canvas range cru
 
 export const INVITED_CONTRIBUTOR = "5F42HAi5kvD6Ao4Ze6UBiZDw7BA4zk62twNYRWAVDq3EhdWH";
 
+export const FERDIE = "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL";
+
 export function signAndSend(keypair: IKeyringPair, extrinsic: SubmittableExtrinsic): Promise<ISubmittableResult> {
     let unsub: () => void;
     return new Promise((resolve, error) => {

diff --git a/packages/node-api/package.json b/packages/node-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@logion/node-api",
-  "version": "0.28.2-2",
+  "version": "0.28.2-3",
   "description": "logion API",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/node-api/src/Adapters.ts b/packages/node-api/src/Adapters.ts
@@ -593,8 +593,7 @@ export class Adapters {
     toHostData(legalOfficerData: PalletLoAuthorityListLegalOfficerData): Partial<HostData> {
         let nodeId: string | undefined;
         if(legalOfficerData.asHost.nodeId.isSome) {
-            const opaquePeerId = legalOfficerData.asHost.nodeId.unwrap();
-            nodeId = base58Encode(opaquePeerId);
+            nodeId = legalOfficerData.asHost.nodeId.toHuman() as string;
         }
 
         let baseUrl: string | undefined;

diff --git a/packages/node-api/src/interfaces/types-lookup.ts b/packages/node-api/src/interfaces/types-lookup.ts
@@ -7,9 +7,9 @@ import '@polkadot/types/lookup';
 
 import type { Bytes, Compact, Enum, Null, Option, Result, Struct, Text, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { ITuple } from '@polkadot/types-codec/types';
-import type { OpaquePeerId } from '@polkadot/types/interfaces/imOnline';
 import type { AccountId32, Call, H160, H256, MultiAddress } from '@polkadot/types/interfaces/runtime';
 import type { Event } from '@polkadot/types/interfaces/system';
+import { OpaquePeerId } from './types';
 
 declare module '@polkadot/types/lookup' {
   /** @name FrameSystemAccountInfo (3) */