diff --git a/multichain-testing/test/ica-channel-close.test.ts b/multichain-testing/test/ica-channel-close.test.ts index d7bf8305ea92..ec2d229bb9e3 100644 --- a/multichain-testing/test/ica-channel-close.test.ts +++ b/multichain-testing/test/ica-channel-close.test.ts @@ -217,7 +217,7 @@ const channelCloseInitScenario = test.macro({ vstorageClient, retryUntilCondition, useChain, - hermes, + relayer, } = t.context; // make an account so there's an ICA channel we can attempt to close @@ -281,14 +281,14 @@ const channelCloseInitScenario = test.macro({ `Initiating channelCloseInit for dst: ${JSON.stringify(dst)} src: ${JSON.stringify(src)}`, ); t.throws( - () => hermes.channelCloseInit(chainName, dst, src), + () => relayer.channelCloseInit(chainName, dst, src), { message: /Command failed/ }, - 'hermes channelCloseInit failed from agoric side for ICA', + 'relayer channelCloseInit failed from agoric side for ICA', ); t.throws( - () => hermes.channelCloseInit(chainName, src, dst), + () => relayer.channelCloseInit(chainName, src, dst), { message: /Command failed/ }, - `hermes channelCloseInit failed from ${chainName} side for ICA`, + `relayer channelCloseInit failed from ${chainName} side for ICA`, ); const remoteQueryClient = makeQueryClient( @@ -298,7 +298,7 @@ const channelCloseInitScenario = test.macro({ () => remoteQueryClient.queryChannel(rPortID, rChannelID), // @ts-expect-error ChannelSDKType.state is a string not a number ({ channel }) => channel?.state === 'STATE_OPEN', - 'Hermes closeChannelInit failed so ICA channel is still open', + 'Relayer closeChannelInit failed so ICA channel is still open', ); t.log(channel); t.is( @@ -330,23 +330,23 @@ const channelCloseInitScenario = test.macro({ }; t.throws( () => - hermes.channelCloseInit( + relayer.channelCloseInit( chainName, dstTransferChannel, srcTransferChannel, ), { message: /Command failed/ }, - 'hermes channelCloseInit failed from agoric side for transfer', + 'relayer channelCloseInit failed from agoric side for transfer', ); t.throws( () => - hermes.channelCloseInit( + relayer.channelCloseInit( chainName, srcTransferChannel, dstTransferChannel, ), { message: /Command failed/ }, - `hermes channelCloseInit failed from ${chainName} side for transfer`, + `relayer channelCloseInit failed from ${chainName} side for transfer`, ); const { channel } = await retryUntilCondition( @@ -357,7 +357,7 @@ const channelCloseInitScenario = test.macro({ ), // @ts-expect-error ChannelSDKType.state is a string not a number ({ channel }) => channel?.state === 'STATE_OPEN', - 'Hermes closeChannelInit failed so transfer channel is still open', + 'Relayer closeChannelInit failed so transfer channel is still open', ); t.log(channel); t.is( diff --git a/multichain-testing/test/support.ts b/multichain-testing/test/support.ts index 2267b8134367..e97b6888ef9e 100644 --- a/multichain-testing/test/support.ts +++ b/multichain-testing/test/support.ts @@ -9,7 +9,7 @@ import { makeGetFile, makeSetupRegistry } from '../tools/registry.js'; import { generateMnemonic } from '../tools/wallet.js'; import { makeRetryUntilCondition } from '../tools/sleep.js'; import { makeDeployBuilder } from '../tools/deploy.js'; -import { makeHermes } from '../tools/hermes-tools.js'; +import { makeRelayer } from '../tools/relayer-tools.js'; export const FAUCET_POUR = 10_000n * 1_000_000n; @@ -62,7 +62,7 @@ export const commonSetup = async (t: ExecutionContext) => { log: t.log, setTimeout: globalThis.setTimeout, }); - const hermes = makeHermes(childProcess); + const relayer = makeRelayer(childProcess); /** * Starts a contract if instance not found. Takes care of installing @@ -97,7 +97,7 @@ export const commonSetup = async (t: ExecutionContext) => { ...keyring, retryUntilCondition, deployBuilder, - hermes, + relayer, startContract, }; }; diff --git a/multichain-testing/tools/hermes-tools.ts b/multichain-testing/tools/relayer-tools.ts similarity index 95% rename from multichain-testing/tools/hermes-tools.ts rename to multichain-testing/tools/relayer-tools.ts index 4868fdd3f888..ebf0562c204d 100644 --- a/multichain-testing/tools/hermes-tools.ts +++ b/multichain-testing/tools/relayer-tools.ts @@ -37,7 +37,7 @@ type ChannelCloseParams = { }; }; -export const makeHermes = ({ execFileSync }: { execFileSync: ExecSync }) => { +export const makeRelayer = ({ execFileSync }: { execFileSync: ExecSync }) => { const exec = ( chainName: string, args: string[],