chore: change convertDRepToCIP129 to convertDRep and use for both conversion

Author: kneerose

tests/govtool-frontend/playwright/lib/helpers/dRep.ts

@@ -88,10 +88,14 @@ export function tohex(drepId: string) {
   ).toString("hex");
 }
 
-export function convertDRepToCIP129(drepId: string, script = false): string {
+export function convertDRep(
+  drepId: string,
+  script = false
+): { cip129: string; cip105: string } {
   const hexPattern = /^[0-9a-fA-F]+$/;
   let cip129DRep: string;
   let cip129DrepHex: string;
+  let cip105DRep: string;
   const prefix = script ? "23" : "22";
   const addPrefix = (hex: string) => {
     if (hex.length === 56) {
@@ -102,8 +106,8 @@ export function convertDRepToCIP129(drepId: string, script = false): string {
       throw new Error("Invalid DRep hex length");
     }
   };
-  const drepIdFromHex = (hex: string) => {
-    return fromHex("drep", hex);
+  const drepIdFromHex = (prefix: string, hex: string) => {
+    return fromHex(prefix, hex);
   };
   if (hexPattern.test(drepId)) {
     cip129DrepHex = addPrefix(drepId);
@@ -115,6 +119,10 @@ export function convertDRepToCIP129(drepId: string, script = false): string {
       throw new Error("Invalid DRep Bech32 format");
     }
   }
-  cip129DRep = drepIdFromHex(cip129DrepHex);
-  return cip129DRep;
+  cip105DRep = drepIdFromHex(
+    cip129DrepHex.slice(0, 2) == "22" ? "drep" : "drep_script",
+    cip129DrepHex.slice(-56)
+  );
+  cip129DRep = drepIdFromHex("drep", cip129DrepHex);
+  return { cip129: cip129DRep, cip105: cip105DRep };
 }

tests/govtool-frontend/playwright/lib/pages/dRepDirectoryPage.ts

@@ -1,4 +1,4 @@
-import { convertDRepToCIP129 } from "@helpers/dRep";
+import { convertDRep } from "@helpers/dRep";
 import { functionWaitedAssert, waitedLoop } from "@helpers/waitedLoop";
 import { Locator, Page, expect } from "@playwright/test";
 import { IDRep } from "@types";
@@ -156,17 +156,21 @@ export default class DRepDirectoryPage {
         const cip105DRepListFE = await this.getAllListedCIP105DRepIds();
         const cip129DRepListFE = await this.getAllListedCIP129DRepIds();
 
-        const cip129DRepListApi = dRepList.map((dRep) =>
-          convertDRepToCIP129(dRep.drepId, dRep.isScriptBased)
+        const cip129DRepListApi = dRepList.map(
+          (dRep) => convertDRep(dRep.drepId, dRep.isScriptBased).cip129
+        );
+
+        const cip105DRepListApi = dRepList.map(
+          (dRep) => convertDRep(dRep.drepId, dRep.isScriptBased).cip105
         );
 
         for (let i = 0; i <= cip105DRepListFE.length - 1; i++) {
           await expect(cip129DRepListFE[i], {
             message: `Cip129 dRep Id from Api:${cip129DRepListApi[i]} is not equal to ${await cip129DRepListFE[i].textContent()} on sort ${option}`,
           }).toHaveText(cip129DRepListApi[i]);
           await expect(cip105DRepListFE[i], {
-            message: `Cip105 dRep Id from Api:${dRepList[i].view} is not equal to ${await cip105DRepListFE[i].textContent()}  on sort ${option}`,
-          }).toHaveText(`(CIP-105) ${dRepList[i].view}`);
+            message: `Cip105 dRep Id from Api:${cip105DRepListApi} is not equal to ${await cip105DRepListFE[i].textContent()}  on sort ${option}`,
+          }).toHaveText(`(CIP-105) ${cip105DRepListApi[i]}`);
         }
       },
       { name: `frontend sort validation of ${option}` }