fixup! test: e2e test of ica channel close flows

Agoric · Aug 8, 2024 · bed93f0 · bed93f0
1 parent 4a69097
commit bed93f0
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 13 deletions.
diff --git a/multichain-testing/test/ica-channel-close.test.ts b/multichain-testing/test/ica-channel-close.test.ts
@@ -10,6 +10,8 @@ import {
 import { makeQueryClient } from '../tools/query.js';
 import { parseLocalAddress, parseRemoteAddress } from '../tools/address.js';
 import chainInfo from '../starship-chain-info.js';
+import type { IdentifiedChannelSDKType } from '@agoric/cosmic-proto/ibc/core/channel/v1/channel.js';
+import type { IBCPortID } from '@agoric/vats';
 
 const test = anyTest as TestFn<SetupContextWithWallets>;
 
@@ -40,6 +42,20 @@ test.after(async t => {
   deleteTestKeys(accounts);
 });
 
+// XXX until new localAddr + remoteAddr are published to vstorage, use
+// original port to determine new channelID
+const findNewChannel = (
+  channels: IdentifiedChannelSDKType[],
+  { rPortID, lPortID }: { rPortID: IBCPortID; lPortID: IBCPortID },
+) =>
+  channels.find(
+    c =>
+      c.port_id === rPortID &&
+      c.counterparty.port_id === lPortID &&
+      // @ts-expect-error ChannelSDKType.state is a string not a number
+      c.state === 'STATE_OPEN',
+  );
+
 /** The account holder chooses to close their ICA account (channel) */
 const intentionalCloseAccountScenario = test.macro({
   title: (_, chainName: string) => `Close and reopen account on ${chainName}`,
@@ -169,18 +185,28 @@ const intentionalCloseAccountScenario = test.macro({
       proposal: {},
     });
 
-    const { channel: rChannelAfterCloseReopen } = await retryUntilCondition(
-      () => remoteQueryClient.queryChannel(rPortID, rChannelID),
+    const { channels } = await retryUntilCondition(
+      () => remoteQueryClient.queryChannels(),
       // @ts-expect-error ChannelSDKType.state is a string not a number
-      ({ channel }) => channel?.state === 'STATE_OPEN',
+      ({ channels }) => findNewChannel(channels, { rPortID, lPortID }),
       `ICA channel is reopened on ${chainName} Host`,
     );
-    t.log('Remote Channel State After Reopening', rChannelAfterCloseReopen);
+    const newChannel = findNewChannel(channels, { rPortID, lPortID });
+    t.log('New Channel after Reopen', newChannel);
+    if (!newChannel) throw new Error('Channel not found');
+    const newAddress = JSON.parse(newChannel.version).address;
+    t.is(newAddress, address, `same chain address is returned - ${chainName}`);
     t.is(
-      rChannelAfterCloseReopen?.state,
+      newChannel.state,
       // @ts-expect-error ChannelSDKType.state is a string not a number
       'STATE_OPEN',
-      `ICA channel is reopened on ${chainName} Host`,
+      `channel is open on ${chainName} Host`,
+    );
+    t.not(newChannel.channel_id, rChannelID, 'remote channel id changed');
+    t.not(
+      newChannel.counterparty.channel_id,
+      lChannelID,
+      'local channel id changed',
     );
   },
 });
@@ -260,7 +286,9 @@ const unintentionalCloseAccountScenario = test.macro({
       channelID: rChannelID,
       portID: rPortID,
     };
-    console.log(`Initiating channelCloseInit for dst: ${dst} src: ${src}`);
+    console.log(
+      `Initiating channelCloseInit for dst: ${JSON.stringify(dst)} src: ${JSON.stringify(src)}`,
+    );
     const closeChannelTx = hermes.channelCloseInit(chainName, dst, src);
     console.log('closeChannelExec', closeChannelTx);
 
@@ -284,17 +312,28 @@ const unintentionalCloseAccountScenario = test.macro({
       'closed state is observed',
     );
 
-    const { channel: channel2 } = await retryUntilCondition(
-      () => remoteQueryClient.queryChannel(rPortID, rChannelID),
+    const { channels } = await retryUntilCondition(
+      () => remoteQueryClient.queryChannels(),
       // @ts-expect-error ChannelSDKType.state is a string not a number
-      ({ channel }) => channel?.state === 'STATE_CLOSED',
-      `ICA channel closed from Hermes closeChannelInit on ${chainName}`,
+      ({ channels }) => findNewChannel(channels, { rPortID, lPortID }),
+      `ICA channel is reopened on ${chainName} Host`,
     );
+    const newChannel = findNewChannel(channels, { rPortID, lPortID });
+    t.log('New Channel after Reopen', newChannel);
+    if (!newChannel) throw new Error('Channel not found');
+    const newAddress = JSON.parse(newChannel.version).address;
+    t.is(newAddress, address, `same chain address is returned - ${chainName}`);
     t.is(
-      channel2?.state,
+      newChannel.state,
       // @ts-expect-error ChannelSDKType.state is a string not a number
       'STATE_OPEN',
-      `channel is automatically reopened on ${chainName}`,
+      `channel is open on ${chainName} Host`,
+    );
+    t.not(newChannel.channel_id, rChannelID, 'remote channel id changed');
+    t.not(
+      newChannel.counterparty.channel_id,
+      lChannelID,
+      'local channel id changed',
     );
   },
 });

diff --git a/multichain-testing/tools/query.ts b/multichain-testing/tools/query.ts
@@ -8,6 +8,7 @@ import type { QueryDelegatorDelegationsResponseSDKType } from '@agoric/cosmic-pr
 import type { QueryDelegatorUnbondingDelegationsResponseSDKType } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/query.js';
 import type { QueryDenomHashResponseSDKType } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/query.js';
 import type { QueryChannelResponseSDKType } from '@agoric/cosmic-proto/ibc/core/channel/v1/query.js';
+import { QueryChannelsResponseSDKType } from '@agoric/cosmic-proto/ibc/core/channel/v1/query.js';
 
 // TODO use telescope generated query client from @agoric/cosmic-proto
 // https://github.com/Agoric/agoric-sdk/issues/9200
@@ -57,5 +58,7 @@ export function makeQueryClient(apiUrl: string) {
       query<QueryChannelResponseSDKType>(
         `/ibc/core/channel/v1/channels/${channelID}/ports/${portID}`,
       ),
+    queryChannels: () =>
+      query<QueryChannelsResponseSDKType>(`/ibc/core/channel/v1/channels`),
   };
 }