fix: test

Author: solidsnakedev

packages/evolution-devnet/test/Client.Devnet.test.ts

@@ -4,12 +4,9 @@ import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
 import { Core } from "@evolution-sdk/evolution"
 import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
-import * as Assets from "@evolution-sdk/evolution/sdk/Assets"
 import { createClient } from "@evolution-sdk/evolution/sdk/client/ClientImpl"
 import type { ProtocolParameters } from "@evolution-sdk/evolution/sdk/ProtocolParameters"
-import type { UTxO } from "@evolution-sdk/evolution/sdk/UTxO"
 import { afterAll, beforeAll } from "vitest"
-import { createCoreTestUtxo } from "./utils/utxo-helpers"
 
 // Alias for Core.Assets
 const CoreAssets = Core.Assets
@@ -19,7 +16,7 @@ const CoreAssets = Core.Assets
  */
 describe("Client with Devnet", () => {
   let devnetCluster: Cluster.Cluster | undefined
-  let genesisUtxos: Array<UTxO> = []
+  let genesisUtxos: Array<Core.UTxO.UTxO> = []
   let genesisConfig: Config.ShelleyGenesis
 
   const TEST_MNEMONIC =
@@ -83,11 +80,11 @@ describe("Client with Devnet", () => {
     expect(calculatedUtxos.length).toBe(1)
 
     const utxo = calculatedUtxos[0]
-    expect(utxo.txHash).toBeDefined()
-    expect(utxo.txHash.length).toBe(64)
-    expect(utxo.outputIndex).toBe(0)
-    expect(utxo.address).toMatch(/^addr_test/)
-    expect(Assets.getAsset(utxo.assets, "lovelace")).toBe(900_000_000_000n)
+    expect(utxo.transactionId).toBeDefined()
+    expect(Core.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
+    expect(utxo.index).toBe(0n)
+    expect(CoreAddress.toBech32(utxo.address)).toMatch(/^addr_test/)
+    expect(utxo.assets.lovelace).toBe(900_000_000_000n)
 
     genesisUtxos = [...calculatedUtxos]
   })
@@ -130,20 +127,12 @@ describe("Client with Devnet", () => {
     const client = createTestClient()
     const genesisAddress = await client.address()
     const genesisAddressBech32 = CoreAddress.toBech32(genesisAddress)
-    const genesisUtxoSdk = genesisUtxos.find((u) => u.address === genesisAddressBech32)
+    const genesisUtxo = genesisUtxos.find((u) => CoreAddress.toBech32(u.address) === genesisAddressBech32)
 
-    if (!genesisUtxoSdk) {
+    if (!genesisUtxo) {
       throw new Error("Genesis UTxO not found")
     }
 
-    // Convert SDK UTxO to Core UTxO
-    const genesisUtxo = createCoreTestUtxo({
-      address: genesisUtxoSdk.address,
-      transactionId: genesisUtxoSdk.txHash,
-      index: genesisUtxoSdk.outputIndex,
-      lovelace: Assets.getAsset(genesisUtxoSdk.assets, "lovelace")
-    })
-
     const receiverAddress =
       "addr_test1qz2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgs68faae"
 
@@ -168,12 +157,12 @@ describe("Client with Devnet", () => {
     const utxos = await client.getWalletUtxos()
     expect(utxos.length).toBeGreaterThan(0)
 
-    const totalInput = Assets.getAsset(genesisUtxo.assets, "lovelace")
+    const totalInput = genesisUtxo.assets.lovelace
     const payment = 5_000_000n
     const fee = await signBuilder.estimateFee()
     const expectedChange = totalInput - payment - fee
 
-    const changeUtxo = utxos.find((u) => Assets.getAsset(u.assets, "lovelace") === expectedChange)
+    const changeUtxo = utxos.find((u) => u.assets.lovelace === expectedChange)
     expect(changeUtxo).toBeDefined()
   })
 })

packages/evolution-devnet/test/Devnet.Genesis.test.ts

@@ -2,6 +2,8 @@ import { describe, expect, it } from "@effect/vitest"
 import * as Cluster from "@evolution-sdk/devnet/Cluster"
 import * as Config from "@evolution-sdk/devnet/Config"
 import * as Genesis from "@evolution-sdk/devnet/Genesis"
+import { Core } from "@evolution-sdk/evolution"
+import * as CoreAddress from "@evolution-sdk/evolution/core/Address"
 import { afterAll, beforeAll } from "vitest"
 
 /**
@@ -50,10 +52,10 @@ describe("Devnet.Genesis", () => {
     expect(utxos.length).toBe(1)
 
     const utxo = utxos[0]
-    expect(utxo.txHash).toBeDefined()
-    expect(utxo.txHash.length).toBe(64)
-    expect(utxo.outputIndex).toBe(0)
-    expect(utxo.address).toMatch(/^addr_test/)
+    expect(utxo.transactionId).toBeDefined()
+    expect(Core.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
+    expect(utxo.index).toBe(0n)
+    expect(CoreAddress.toBech32(utxo.address)).toMatch(/^addr_test/)
     expect(utxo.assets).toBeDefined()
   })
 
@@ -66,10 +68,10 @@ describe("Devnet.Genesis", () => {
     expect(utxos.length).toBe(1)
 
     const utxo = utxos[0]
-    expect(utxo.txHash).toBeDefined()
-    expect(utxo.txHash.length).toBe(64)
-    expect(utxo.outputIndex).toBe(0)
-    expect(utxo.address).toMatch(/^addr_test/)
+    expect(utxo.transactionId).toBeDefined()
+    expect(Core.TransactionHash.toHex(utxo.transactionId).length).toBe(64)
+    expect(utxo.index).toBe(0n)
+    expect(CoreAddress.toBech32(utxo.address)).toMatch(/^addr_test/)
     expect(utxo.assets).toBeDefined()
   })
 
@@ -82,10 +84,10 @@ describe("Devnet.Genesis", () => {
     expect(calculated.length).toBe(queried.length)
 
     for (let i = 0; i < calculated.length; i++) {
-      expect(calculated[i].txHash).toBe(queried[i].txHash)
-      expect(calculated[i].outputIndex).toBe(queried[i].outputIndex)
-      expect(calculated[i].address).toBe(queried[i].address)
-      expect(calculated[i].assets).toEqual(queried[i].assets)
+      expect(Core.TransactionHash.toHex(calculated[i].transactionId)).toBe(Core.TransactionHash.toHex(queried[i].transactionId))
+      expect(calculated[i].index).toBe(queried[i].index)
+      expect(CoreAddress.toBech32(calculated[i].address)).toBe(CoreAddress.toBech32(queried[i].address))
+      expect(calculated[i].assets.lovelace).toEqual(queried[i].assets.lovelace)
     }
   })
 
@@ -112,14 +114,17 @@ describe("Devnet.Genesis", () => {
 
     expect(utxos.length).toBe(3)
 
-    // Each genesis UTxO has outputIndex 0
-    expect(utxos[0].outputIndex).toBe(0)
-    expect(utxos[1].outputIndex).toBe(0)
-    expect(utxos[2].outputIndex).toBe(0)
+    // Each genesis UTxO has index 0n
+    expect(utxos[0].index).toBe(0n)
+    expect(utxos[1].index).toBe(0n)
+    expect(utxos[2].index).toBe(0n)
 
     // Each address gets unique pseudo-TxId
-    expect(utxos[0].txHash).not.toBe(utxos[1].txHash)
-    expect(utxos[1].txHash).not.toBe(utxos[2].txHash)
-    expect(utxos[0].txHash).not.toBe(utxos[2].txHash)
+    const txHash0 = Core.TransactionHash.toHex(utxos[0].transactionId)
+    const txHash1 = Core.TransactionHash.toHex(utxos[1].transactionId)
+    const txHash2 = Core.TransactionHash.toHex(utxos[2].transactionId)
+    expect(txHash0).not.toBe(txHash1)
+    expect(txHash1).not.toBe(txHash2)
+    expect(txHash0).not.toBe(txHash2)
   })
 })