Skip to content

Commit

Permalink
cleanup and add tests to ci e2e workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
gjermundgaraba committed Jan 9, 2025
1 parent 52e9fb7 commit e72134e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 25 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ jobs:
- TestWithRelayerTestSuite/Test_5_TimeoutPacketFromEth_Plonk
- TestWithRelayerTestSuite/TestRecvPacketToCosmos
- TestWithRelayerTestSuite/Test_10_RecvPacketToCosmos
- TestWithRelayerTestSuite/TestBatchedAckPacketToCosmos
- TestWithRelayerTestSuite/Test_10_BatchedAckPacketToCosmos
- TestWithRelayerTestSuite/TestTimeoutPacketFromCosmos
- TestWithRelayerTestSuite/Test_10_TimeoutPacketFromCosmos
- TestWithCosmosRelayerTestSuite/TestRelayerInfo
- TestWithCosmosRelayerTestSuite/TestICS20RecvAndAckPacket
- TestWithCosmosRelayerTestSuite/Test_10_ICS20RecvAndAckPacket
Expand Down
1 change: 0 additions & 1 deletion e2e/interchaintestv8/relayer/relayer.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ func binaryPath() string {
// StartRelayer starts the relayer with the given config file.
func StartRelayer(configPath string) (*os.Process, error) {
cmd := exec.Command(binaryPath(), "start", "--config", configPath)
cmd.Env = append(os.Environ(), "RUST_BACKTRACE=1")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr

Expand Down
25 changes: 1 addition & 24 deletions e2e/interchaintestv8/relayer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ func (s *RelayerTestSuite) ICS20TransferERC20TokenBatchedAckToCosmosTest(
ethereumUserAddress := crypto.PubkeyToAddress(s.key.PublicKey)
cosmosUserWallet := s.CosmosUsers[0]
cosmosUserAddress := cosmosUserWallet.FormattedAddress()
sendMemo := "nonnativesend"
sendMemo := "batched ack to cosmos test memo"

var (
transferCoin sdk.Coin
Expand Down Expand Up @@ -1061,31 +1061,8 @@ func (s *RelayerTestSuite) ICS20TransferERC20TokenBatchedAckToCosmosTest(
receipt := s.GetTxReciept(ctx, eth, signedTx.Hash())
s.Require().Equal(ethtypes.ReceiptStatusSuccessful, receipt.Status, fmt.Sprintf("Tx failed: %+v", receipt))
ackTxHash = signedTx.Hash().Bytes()

/* Commenting out this part for now, once the test with removed event work we can update it
s.True(s.Run("Verify balances on Ethereum", func() {
ethReceiveTransferEvent, err := e2esuite.GetEvmEvent(receipt, s.ics20Contract.ParseICS20ReceiveTransfer)
s.Require().NoError(err)
ethClient, err := ethclient.Dial(eth.RPC)
s.Require().NoError(err)
ibcERC20, err := ibcerc20.NewContract(ethReceiveTransferEvent.Erc20Address, ethClient)
s.Require().NoError(err)
// User balance on Ethereum
userBalance, err := ibcERC20.BalanceOf(nil, ethereumUserAddress)
s.Require().NoError(err)
s.Require().Equal(totalTransferAmount, userBalance)
// ICS20 contract balance on Ethereum
ics20TransferBalance, err := ibcERC20.BalanceOf(nil, ics20Address)
s.Require().NoError(err)
s.Require().Equal(int64(0), ics20TransferBalance.Int64())
}))
*/
}))

// TODO: When we get the mock option, we can just add the code below to `RecvPacketToEthTest`
var txBodyBz []byte
s.Require().True(s.Run("Retrieve relay tx to Cosmos chain", func() {
resp, err := s.EthToCosmosRelayerClient.RelayByTx(context.Background(), &relayertypes.RelayByTxRequest{
Expand Down

0 comments on commit e72134e

Please sign in to comment.