From c3c196848fe340e6130560c2b89c772d40c7c901 Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 25 Feb 2025 23:04:33 -0500 Subject: [PATCH] switch back to CosmosRly --- .../e2e/forward_timeout_test.go | 2 +- .../e2e/packet_forward_non_refundable_test.go | 2 +- .../e2e/packet_forward_test.go | 24 ++++++++++++------- .../packet-forward-middleware/e2e/setup.go | 8 +++---- .../e2e/storage_leak_test.go | 2 +- .../e2e/unnecessary_loop_test.go | 2 +- .../e2e/upgrade_test.go | 10 ++++---- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/middleware/packet-forward-middleware/e2e/forward_timeout_test.go b/middleware/packet-forward-middleware/e2e/forward_timeout_test.go index 4d911d63..047f4fd2 100644 --- a/middleware/packet-forward-middleware/e2e/forward_timeout_test.go +++ b/middleware/packet-forward-middleware/e2e/forward_timeout_test.go @@ -62,7 +62,7 @@ func TestTimeoutOnForward(t *testing.T) { chainA, chainB, chainC, chainD := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain), chains[2].(*cosmos.CosmosChain), chains[3].(*cosmos.CosmosChain) r := interchaintest.NewBuiltinRelayerFactory( - ibc.Hermes, + ibc.CosmosRly, zaptest.NewLogger(t), relayer.DockerImage(&DefaultRelayer), ).Build(t, client, network) diff --git a/middleware/packet-forward-middleware/e2e/packet_forward_non_refundable_test.go b/middleware/packet-forward-middleware/e2e/packet_forward_non_refundable_test.go index 8c33eb9b..07978d4b 100644 --- a/middleware/packet-forward-middleware/e2e/packet_forward_non_refundable_test.go +++ b/middleware/packet-forward-middleware/e2e/packet_forward_non_refundable_test.go @@ -88,7 +88,7 @@ func TestNonRefundable(t *testing.T) { chainA, chainB, chainC := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain), chains[2].(*cosmos.CosmosChain) r := interchaintest.NewBuiltinRelayerFactory( - ibc.Hermes, + ibc.CosmosRly, zaptest.NewLogger(t), relayer.DockerImage(&DefaultRelayer), ).Build(t, client, network) diff --git a/middleware/packet-forward-middleware/e2e/packet_forward_test.go b/middleware/packet-forward-middleware/e2e/packet_forward_test.go index a8b32bc6..fc19dfae 100644 --- a/middleware/packet-forward-middleware/e2e/packet_forward_test.go +++ b/middleware/packet-forward-middleware/e2e/packet_forward_test.go @@ -80,7 +80,7 @@ func TestPacketForwardMiddleware(t *testing.T) { chainA, chainB, chainC, chainD := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain), chains[2].(*cosmos.CosmosChain), chains[3].(*cosmos.CosmosChain) r := interchaintest.NewBuiltinRelayerFactory( - ibc.Hermes, + ibc.CosmosRly, zaptest.NewLogger(t), relayer.DockerImage(&DefaultRelayer), ).Build(t, client, network) @@ -416,19 +416,25 @@ func TestPacketForwardMiddleware(t *testing.T) { require.NoError(t, err) transferTx, err := chainA.SendIBCTransfer(ctx, abChan.ChannelID, userA.KeyName(), transfer, ibc.TransferOptions{ - Timeout: &ibc.IBCTimeout{ - NanoSeconds: uint64(time.Now().Add(1 * time.Minute).Unix()), - Height: 0, - }, + //Timeout: &ibc.IBCTimeout{ + // NanoSeconds: uint64(time.Now().Add(1 * time.Minute).Unix()), + // Height: 0, + //}, Memo: string(memo), }) require.NoError(t, err) - // Wait for the packet to relayed back to A - err = testutil.WaitForCondition(time.Minute*5, time.Second*5, func() (bool, error) { - return PacketAcknowledged(ctx, chainA, abChan.PortID, abChan.ChannelID, transferTx.Packet.Sequence), nil + chainAHeight, err := chainA.Height(ctx) + require.NoError(t, err) - }) + _, err = testutil.PollForAck(ctx, chainA, chainAHeight, chainAHeight+25, transferTx.Packet) + require.NoError(t, err) + + // Wait for the packet to relayed back to A + //err = testutil.WaitForCondition(time.Minute*5, time.Second*5, func() (bool, error) { + // return PacketAcknowledged(ctx, chainA, abChan.PortID, abChan.ChannelID, transferTx.Packet.Sequence), nil + // + //}) require.NoError(t, err) err = testutil.WaitForBlocks(ctx, waitBlocks, chainA) require.NoError(t, err) diff --git a/middleware/packet-forward-middleware/e2e/setup.go b/middleware/packet-forward-middleware/e2e/setup.go index fa57f29a..80e92e8b 100644 --- a/middleware/packet-forward-middleware/e2e/setup.go +++ b/middleware/packet-forward-middleware/e2e/setup.go @@ -15,7 +15,7 @@ var ( PFMImage = ibc.DockerImage{ Repository: pfmRepo, Version: pfmVersion, - UidGid: "1025:1025", + UIDGID: "1025:1025", } Denom = "utoken" @@ -53,9 +53,9 @@ var ( } DefaultRelayer = ibc.DockerImage{ - Repository: "ghcr.io/informalsystems/hermes", - Version: "1.12.0", - UidGid: "2000:2000", + Repository: "ghcr.io/cosmos/relayer", + Version: "main", + UIDGID: "1025:1025", } ) diff --git a/middleware/packet-forward-middleware/e2e/storage_leak_test.go b/middleware/packet-forward-middleware/e2e/storage_leak_test.go index c0a5a41d..6e6353ea 100644 --- a/middleware/packet-forward-middleware/e2e/storage_leak_test.go +++ b/middleware/packet-forward-middleware/e2e/storage_leak_test.go @@ -67,7 +67,7 @@ func TestStorageLeak(t *testing.T) { chainA, chainB, chainC := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain), chains[2].(*cosmos.CosmosChain) r := interchaintest.NewBuiltinRelayerFactory( - ibc.Hermes, + ibc.CosmosRly, zaptest.NewLogger(t), relayer.DockerImage(&DefaultRelayer), ).Build(t, client, network) diff --git a/middleware/packet-forward-middleware/e2e/unnecessary_loop_test.go b/middleware/packet-forward-middleware/e2e/unnecessary_loop_test.go index fa6fd31f..62a305e4 100644 --- a/middleware/packet-forward-middleware/e2e/unnecessary_loop_test.go +++ b/middleware/packet-forward-middleware/e2e/unnecessary_loop_test.go @@ -55,7 +55,7 @@ func TestUnnecessaryLoop(t *testing.T) { chainA, chainB := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain) r := interchaintest.NewBuiltinRelayerFactory( - ibc.Hermes, + ibc.CosmosRly, zaptest.NewLogger(t), relayer.DockerImage(&DefaultRelayer), ).Build(t, client, network) diff --git a/middleware/packet-forward-middleware/e2e/upgrade_test.go b/middleware/packet-forward-middleware/e2e/upgrade_test.go index 76ceafea..488a88b1 100644 --- a/middleware/packet-forward-middleware/e2e/upgrade_test.go +++ b/middleware/packet-forward-middleware/e2e/upgrade_test.go @@ -42,7 +42,7 @@ var ( baseChain = ibc.DockerImage{ Repository: "pfm", Version: "v8.1.0", - UidGid: "1025:1025", + UIDGID: "1025:1025", } // make local-image @@ -116,7 +116,7 @@ func CosmosChainUpgradeTest(t *testing.T, chainName, upgradeRepo, upgradeDockerT chainA, chainB, chainC, chainD := chains[0].(*cosmos.CosmosChain), chains[1].(*cosmos.CosmosChain), chains[2].(*cosmos.CosmosChain), chains[3].(*cosmos.CosmosChain) r := interchaintest.NewBuiltinRelayerFactory( - ibc.Hermes, + ibc.CosmosRly, zaptest.NewLogger(t), relayer.DockerImage(&DefaultRelayer), ).Build(t, client, network) @@ -447,12 +447,12 @@ func UpgradeNodes(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, } func ValidatorVoting(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, proposalID string, height int64, haltHeight int64) { - err := chain.VoteOnProposalAllValidators(ctx, proposalID, cosmos.ProposalVoteYes) - require.NoError(t, err, "failed to submit votes") - proposalInt, err := strconv.ParseUint(proposalID, 10, 64) require.NoError(t, err, "failed to parse proposalID") + err = chain.VoteOnProposalAllValidators(ctx, proposalInt, cosmos.ProposalVoteYes) + require.NoError(t, err, "failed to submit votes") + _, err = cosmos.PollForProposalStatusV1(ctx, chain, height, height+haltHeightDelta, proposalInt, govv1.ProposalStatus_PROPOSAL_STATUS_PASSED) require.NoError(t, err, "proposal status did not change to passed in expected number of blocks")