use built lib in e2e tests and cast expected return to Uint8Array bytes

Author: Ryang-21

test/e2e/src/bindings.test.ts

@@ -9,7 +9,7 @@ import {
   generateFundedKeypair,
   installContract,
 } from "./util.js";
-import { Address, contract } from "../../../src/index.js";
+import { Address, contract } from "../../../lib/esm/index.js";
 
 const CLI_PATH = path.resolve(__dirname, "../../../bin/stellar-js");
 
@@ -331,12 +331,12 @@ describe("Generated Bindings E2E Test", () => {
     // Test bytes method
     const bytesInput = Buffer.from("hello");
     const bytesResult = await client.bytes({ bytes: bytesInput });
-    expect(bytesResult.result).toEqual(bytesInput);
+    expect(bytesResult.result).toEqual(Uint8Array.from(bytesInput));
 
     // Test bytes_n method
     const bytesNInput = Buffer.from("123456789");
     const bytesNResult = await client.bytes_n({ bytes_n: bytesNInput });
-    expect(bytesNResult.result).toEqual(bytesNInput);
+    expect(bytesNResult.result).toEqual(Uint8Array.from(bytesNInput));
 
     // Test card method
     const cardResult = await client.card({ card: 11 });

test/e2e/src/constructor-args.test.ts

@@ -1,7 +1,7 @@
 import { expect, beforeAll, describe, it } from "vitest";
-import { contract } from "../../../lib/esm/index.js";
+import { contract } from "../../../src/index.js";
 import { installContract, rpcUrl, networkPassphrase } from "./util.js";
-import { basicNodeSigner } from "../../../lib/esm/contract/index.js";
+import { basicNodeSigner } from "../../../src/contract/index.js";
 
 const INIT_VALUE = 42;
 

test/e2e/src/custom-types.test.ts

@@ -1,5 +1,5 @@
 import { expect, beforeAll, describe, it } from "vitest";
-import { Address, contract } from "../../../src/index.js";
+import { Address, contract } from "../../../lib/esm/index.js";
 import { clientFor } from "./util.js";
 
 let context: {
@@ -177,13 +177,15 @@ describe("Custom Types Tests", () => {
 
   it("bytes", async () => {
     const bytes = Buffer.from("hello");
-    expect((await context.client.bytes({ bytes })).result).toEqual(bytes);
+    expect((await context.client.bytes({ bytes })).result).toEqual(
+      Uint8Array.from(bytes),
+    );
   });
 
   it("bytesN", async () => {
     const bytesN = Buffer.from("123456789"); // what's the correct way to construct bytesN?
     expect((await context.client.bytes_n({ bytes_n: bytesN })).result).toEqual(
-      bytesN,
+      Uint8Array.from(bytesN),
     );
   });
 

test/e2e/src/swap.test.ts

@@ -1,5 +1,5 @@
 import { expect, describe, it, beforeAll } from "vitest";
-import { contract, rpc } from "../../../src/index.js";
+import { contract, rpc } from "../../../lib/esm/index.js";
 import { clientFor, generateFundedKeypair } from "./util.js";
 
 const amountAToSwap = 2n;

test/e2e/src/util.ts

@@ -1,6 +1,6 @@
 import { spawnSync } from "node:child_process";
 import path from "node:path";
-import { contract, Keypair, rpc } from "../../../src/index.js";
+import { contract, Keypair, rpc } from "../../../lib/esm/index.js";
 
 /*
  * Run a Bash command, returning stdout, stderr, and status code.
@@ -110,10 +110,12 @@ const installContract = async (
   const internalKeypair = keypair ?? (await generateFundedKeypair());
 
   let wasmHash = contracts[name].hash;
+  console.log("in installContract, wasmHash:", wasmHash);
   if (!wasmHash) {
     wasmHash = run(
       `${stellar} contract upload --wasm ${contracts[name].path}`,
     ).stdout;
+    console.log("wasm hash didn't exist, so uploaded and got:", wasmHash);
   }
   return { keypair: internalKeypair, wasmHash };
 };
@@ -143,7 +145,7 @@ const clientFor = async (
   const { wasmHash } = await installContract(name, {
     keypair: internalKeypair,
   });
-
+  console.log(`wasmHash for ${name}: ${wasmHash} <========`);
   const deploy = await contract.Client.deploy(
     (contracts[name] as any).constructorArgs ?? null,
     {