fix integration tests?

Stride-Labs · Sep 5, 2024 · b05af9d · b05af9d
1 parent a372a9b
commit b05af9d
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 40 deletions.
diff --git a/integration-tests/client/README.md b/integration-tests/client/README.md
@@ -23,7 +23,7 @@ IMPORTANT: `@cosmjs/*` dependencies must match the versions used by stridejs. To
 ### test new protobufs
 
 - go to https://github.com/Stride-Labs/stridejs
-  - update the config in `scripts/clone_repos.ts` to point to the new `stride/cosmos-sdk/ibc-go` version
+  - update the config in `scripts/clone_repos.ts` to point to the new `stride`, `cosmos-sdk`, `ibc-go`, `wasmd` versions
   - run `pnpm i`
   - run `pnpm codegen`
   - run `git commit...`

diff --git a/integration-tests/client/package.json b/integration-tests/client/package.json
@@ -25,7 +25,7 @@
     "bech32": "2.0.0",
     "jest": "29.7.0",
     "prettier": "3.3.3",
-    "stridejs": "github:Stride-Labs/stridejs#f369bd62361a6879f182038c2648c33348863a7e",
+    "stridejs": "github:Stride-Labs/stridejs#f8ed078fba0b6cd818487d8fa7059b9b916ca355",
     "typescript": "5.5.3",
     "vitest": "2.0.3"
   },

diff --git a/integration-tests/client/pnpm-lock.yaml b/integration-tests/client/pnpm-lock.yaml
diff --git a/integration-tests/client/test/core.test.ts b/integration-tests/client/test/core.test.ts
@@ -1,13 +1,8 @@
 import { Secp256k1HdWallet } from "@cosmjs/amino";
 import { GasPrice } from "@cosmjs/stargate";
-import {
-  StrideClient,
-  ibcDenom,
-  coinFromString,
-  convertBech32Prefix,
-} from "stridejs";
+import { StrideClient, ibcDenom } from "stridejs";
 import { beforeAll, describe, test } from "vitest";
-import { waitForChain, submitTxAndExpectSuccess } from "./utils";
+import { submitTxAndExpectSuccess, waitForChain } from "./utils";
 
 const RPC_ENDPOINT = "https://stride-rpc.internal.stridenet.co";
 
@@ -90,7 +85,10 @@ describe("x/stakeibc", () => {
       creator: stridejs.address,
       bech32prefix: "cosmos",
       hostDenom: "uatom",
-      ibcDenom: ibcDenom([{incomingPortId: "transfer", incomingChannelId: "channel-0"}], "uatom"),
+      ibcDenom: ibcDenom(
+        [{ incomingPortId: "transfer", incomingChannelId: "channel-0" }],
+        "uatom",
+      ),
       connectionId: "connection-0",
       transferChannelId: "channel-0",
       unbondingPeriod: BigInt(1),
@@ -99,26 +97,30 @@ describe("x/stakeibc", () => {
       lsmLiquidStakeEnabled: true,
       communityPoolTreasuryAddress: "",
       maxMessagesPerIcaTx: BigInt(2),
-    })
-
-    const msg = stridejs.types.stride.stakeibc.MessageComposer.withTypeUrl.registerHostZone({
-        creator: stridejs.address,
-        bech32prefix: "cosmos",
-        hostDenom: "uatom",
-        ibcDenom: ibcDenom([{incomingPortId: "transfer", incomingChannelId: "channel-0"}], "uatom"),
-        connectionId: "connection-0",
-        transferChannelId: "channel-0",
-        unbondingPeriod: BigInt(1),
-        minRedemptionRate: "0.9",
-        maxRedemptionRate: "1.5",
-        lsmLiquidStakeEnabled: true,
-        communityPoolTreasuryAddress: "",
-        maxMessagesPerIcaTx: BigInt(2),
     });
 
+    const msg =
+      stridejs.types.stride.stakeibc.MessageComposer.withTypeUrl.registerHostZone(
+        {
+          creator: stridejs.address,
+          bech32prefix: "cosmos",
+          hostDenom: "uatom",
+          ibcDenom: ibcDenom(
+            [{ incomingPortId: "transfer", incomingChannelId: "channel-0" }],
+            "uatom",
+          ),
+          connectionId: "connection-0",
+          transferChannelId: "channel-0",
+          unbondingPeriod: BigInt(1),
+          minRedemptionRate: "0.9",
+          maxRedemptionRate: "1.5",
+          lsmLiquidStakeEnabled: true,
+          communityPoolTreasuryAddress: "",
+          maxMessagesPerIcaTx: BigInt(2),
+        },
+      );
+
     await submitTxAndExpectSuccess(stridejs, [msg]);
     console.log(stridejs.query.stride.stakeibc.hostZoneAll());
   });
 });
-
-
diff --git a/integration-tests/client/test/main.test.ts b/integration-tests/client/test/main.test.ts
@@ -119,12 +119,13 @@ describe("x/airdrop", () => {
     }
     expect(tx.code).toBe(0);
 
-    const { airdrop } = await stridejs.query.stride.airdrop.airdrop({
-      id: airdropId,
-    });
+    const { id, earlyClaimPenalty } =
+      await stridejs.query.stride.airdrop.airdrop({
+        id: airdropId,
+      });
 
-    expect(airdrop!.id).toBe(airdropId);
-    expect(airdrop!.earlyClaimPenalty).toBe("0.5");
+    expect(id).toBe(airdropId);
+    expect(earlyClaimPenalty).toBe("0.5");
   });
 });
 
@@ -145,7 +146,7 @@ describe("ibc", () => {
             revisionHeight: 0n,
           },
           timeoutTimestamp: BigInt(
-            `${Math.floor(Date.now() / 1000) + 3 * 60}000000000`, // 3 minutes 
+            `${Math.floor(Date.now() / 1000) + 3 * 60}000000000`, // 3 minutes
           ),
           memo: "",
         },

diff --git a/integration-tests/client/test/utils.ts b/integration-tests/client/test/utils.ts
@@ -1,4 +1,5 @@
-import { coinsFromString, StrideClient } from "stridejs";
+import { coinsFromString, EncodeObject, StrideClient } from "stridejs";
+import { expect } from "vitest";
 
 /**
  * Waits for the chain to start by continuously sending transactions until .
@@ -30,4 +31,22 @@ export async function waitForChain(
       // signAndBroadcast might throw if the RPC is not up yet
     }
   }
-}
+}
+
+/**
+ * Submit a transaction and wait for it to be broadcasted and executed.
+ *
+ * @param {StrideClient} stridejs The Stride client instance.
+ * @param {any[]} msgs The messages array.
+ */
+export async function submitTxAndExpectSuccess(
+  stridejs: StrideClient,
+  msgs: EncodeObject[],
+): Promise<void> {
+  const tx = await stridejs.signAndBroadcast(msgs, 2);
+
+  if (tx.code !== 0) {
+    console.error(tx.rawLog);
+  }
+  expect(tx.code).toBe(0);
+}