Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
renaming in the runner package
Browse files Browse the repository at this point in the history
lumtis committed Dec 6, 2024
1 parent 4ffc159 commit cc751b5
Showing 76 changed files with 1,337 additions and 1,341 deletions.
14 changes: 7 additions & 7 deletions cmd/zetae2e/local/admin.go
Original file line number Diff line number Diff line change
@@ -38,15 +38,15 @@ func adminTestRoutine(

// funding the account
// we transfer around the total supply of Zeta to the admin for the chain migration test
txZetaSend := deployerRunner.SendZetaOnEvm(account.EVMAddress(), 20_500_000_000)
txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 1000)
adminRunner.WaitForTxReceiptOnEvm(txZetaSend)
adminRunner.WaitForTxReceiptOnEvm(txERC20Send)
txZetaSend := deployerRunner.LegacySendZetaOnEvm(account.EVMAddress(), 20_500_000_000)
txERC20Send := deployerRunner.SendERC20OnEVM(account.EVMAddress(), 1000)
adminRunner.WaitForTxReceiptOnEVM(txZetaSend)
adminRunner.WaitForTxReceiptOnEVM(txERC20Send)

// depositing the necessary tokens on ZetaChain
txZetaDeposit := adminRunner.DepositZeta()
txEtherDeposit := adminRunner.DepositEther()
txERC20Deposit := adminRunner.DepositERC20()
txZetaDeposit := adminRunner.LegacyDepositZeta()
txEtherDeposit := adminRunner.LegacyDepositEther()
txERC20Deposit := adminRunner.LegacyDepositERC20()
adminRunner.WaitForMinedCCTX(txZetaDeposit)
adminRunner.WaitForMinedCCTX(txEtherDeposit)
adminRunner.WaitForMinedCCTX(txERC20Deposit)
8 changes: 4 additions & 4 deletions cmd/zetae2e/local/bitcoin.go
Original file line number Diff line number Diff line change
@@ -93,12 +93,12 @@ func initBitcoinRunner(
require.NoError(runner, err)

// send ERC20 token on EVM
txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 1000)
runner.WaitForTxReceiptOnEvm(txERC20Send)
txERC20Send := deployerRunner.SendERC20OnEVM(account.EVMAddress(), 1000)
runner.WaitForTxReceiptOnEVM(txERC20Send)

// deposit ETH and ERC20 tokens on ZetaChain
txEtherDeposit := runner.DepositEther()
txERC20Deposit := runner.DepositERC20()
txEtherDeposit := runner.LegacyDepositEther()
txERC20Deposit := runner.LegacyDepositERC20()

runner.WaitForMinedCCTX(txEtherDeposit)
runner.WaitForMinedCCTX(txERC20Deposit)
4 changes: 2 additions & 2 deletions cmd/zetae2e/local/evm.go
Original file line number Diff line number Diff line change
@@ -114,8 +114,8 @@ func evmTestRoutine(
startTime := time.Now()

// funding the account
txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 10000)
v2Runner.WaitForTxReceiptOnEvm(txERC20Send)
txERC20Send := deployerRunner.SendERC20OnEVM(account.EVMAddress(), 10000)
v2Runner.WaitForTxReceiptOnEVM(txERC20Send)

// run erc20 test
testsToRun, err := v2Runner.GetE2ETestsToRunByName(
26 changes: 13 additions & 13 deletions cmd/zetae2e/local/legacy.go
Original file line number Diff line number Diff line change
@@ -37,12 +37,12 @@ func legacyERC20TestRoutine(
startTime := time.Now()

// funding the account
txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 10000)
erc20Runner.WaitForTxReceiptOnEvm(txERC20Send)
txERC20Send := deployerRunner.SendERC20OnEVM(account.EVMAddress(), 10000)
erc20Runner.WaitForTxReceiptOnEVM(txERC20Send)

// depositing the necessary tokens on ZetaChain
txEtherDeposit := erc20Runner.DepositEther()
txERC20Deposit := erc20Runner.DepositERC20()
txEtherDeposit := erc20Runner.LegacyDepositEther()
txERC20Deposit := erc20Runner.LegacyDepositERC20()
erc20Runner.WaitForMinedCCTX(txEtherDeposit)
erc20Runner.WaitForMinedCCTX(txERC20Deposit)

@@ -89,7 +89,7 @@ func legacyEthereumTestRoutine(
startTime := time.Now()

// depositing the necessary tokens on ZetaChain
txEtherDeposit := ethereumRunner.DepositEther()
txEtherDeposit := ethereumRunner.LegacyDepositEther()
ethereumRunner.WaitForMinedCCTX(txEtherDeposit)

// run ethereum test
@@ -138,12 +138,12 @@ func legacyZEVMMPTestRoutine(
startTime := time.Now()

// funding the account
txZetaSend := deployerRunner.SendZetaOnEvm(account.EVMAddress(), 1000)
zevmMPRunner.WaitForTxReceiptOnEvm(txZetaSend)
txZetaSend := deployerRunner.LegacySendZetaOnEvm(account.EVMAddress(), 1000)
zevmMPRunner.WaitForTxReceiptOnEVM(txZetaSend)

// depositing the necessary tokens on ZetaChain
txZetaDeposit := zevmMPRunner.DepositZeta()
txEtherDeposit := zevmMPRunner.DepositEther()
txZetaDeposit := zevmMPRunner.LegacyDepositZeta()
txEtherDeposit := zevmMPRunner.LegacyDepositEther()
zevmMPRunner.WaitForMinedCCTX(txZetaDeposit)
zevmMPRunner.WaitForMinedCCTX(txEtherDeposit)

@@ -191,12 +191,12 @@ func legacyZETATestRoutine(
startTime := time.Now()

// funding the account
txZetaSend := deployerRunner.SendZetaOnEvm(account.EVMAddress(), 1000)
zetaRunner.WaitForTxReceiptOnEvm(txZetaSend)
txZetaSend := deployerRunner.LegacySendZetaOnEvm(account.EVMAddress(), 1000)
zetaRunner.WaitForTxReceiptOnEVM(txZetaSend)

// depositing the necessary tokens on ZetaChain
txZetaDeposit := zetaRunner.DepositZeta()
txEtherDeposit := zetaRunner.DepositEther()
txZetaDeposit := zetaRunner.LegacyDepositZeta()
txEtherDeposit := zetaRunner.LegacyDepositEther()
zetaRunner.WaitForMinedCCTX(txZetaDeposit)
zetaRunner.WaitForMinedCCTX(txEtherDeposit)

6 changes: 3 additions & 3 deletions cmd/zetae2e/local/local.go
Original file line number Diff line number Diff line change
@@ -220,9 +220,9 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
// TODO: merge v1 and v2 together
// https://github.com/zeta-chain/node/issues/2627

deployerRunner.SetupEVM(contractsDeployed, true)
deployerRunner.LegacySetupEVM(contractsDeployed, true)

deployerRunner.SetupEVMV2()
deployerRunner.SetupEVM()

if testSolana {
deployerRunner.SetupSolana(
@@ -252,7 +252,7 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
deployerRunner.UpdateChainParamsV2Contracts()
deployerRunner.ERC20CustodyAddr = deployerRunner.ERC20CustodyV2Addr

deployerRunner.MintERC20OnEvm(1e10)
deployerRunner.MintERC20OnEVM(1e10)

logger.Print("✅ setup completed in %s", time.Since(startTime))
}
2 changes: 1 addition & 1 deletion cmd/zetae2e/local/performance.go
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ func ethereumWithdrawPerformanceRoutine(
startTime := time.Now()

// depositing the necessary tokens on ZetaChain
txEtherDeposit := r.DepositEther()
txEtherDeposit := r.LegacyDepositEther()
r.WaitForMinedCCTX(txEtherDeposit)

tests, err := r.GetE2ETestsToRunByName(
4 changes: 2 additions & 2 deletions cmd/zetae2e/local/precompiles.go
Original file line number Diff line number Diff line change
@@ -56,8 +56,8 @@ func statefulPrecompilesTestRoutine(
startTime := time.Now()

// Send ERC20 that will be depositted into ERC20ZRC20 tokens.
txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 1e7)
precompileRunner.WaitForTxReceiptOnEvm(txERC20Send)
txERC20Send := deployerRunner.SendERC20OnEVM(account.EVMAddress(), 1e7)
precompileRunner.WaitForTxReceiptOnEVM(txERC20Send)

testsToRun, err := precompileRunner.GetE2ETestsToRunByName(
e2etests.AllE2ETests,
6 changes: 3 additions & 3 deletions cmd/zetae2e/local/tss_migration.go
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ func tssMigrationTestRoutine(
if err := tssMigrationTestRunner.RunE2ETests(testsToRun); err != nil {
return fmt.Errorf("TSS migration tests failed: %v", err)
}
if err := tssMigrationTestRunner.CheckBtcTSSBalance(); err != nil {
if err := tssMigrationTestRunner.CheckBTCTSSBalance(); err != nil {
return err
}

@@ -90,7 +90,7 @@ func TSSMigration(deployerRunner *runner.E2ERunner, logger *runner.Logger, verbo
logger.Print("❌ tss migration failed")
os.Exit(1)
}
deployerRunner.UpdateTssAddressForConnector()
deployerRunner.UpdateTssAddressForErc20custody()
deployerRunner.UpdateTSSAddressForConnector()
deployerRunner.UpdateTSSAddressForERC20custody()
logger.Print("✅ migration completed in %s ", time.Since(migrationStartTime).String())
}
6 changes: 3 additions & 3 deletions cmd/zetae2e/stress.go
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ func StressTest(cmd *cobra.Command, _ []string) {

// setup TSS addresses
noError(e2eTest.SetTSSAddresses())
e2eTest.SetupEVM(stressTestArgs.contractsDeployed, true)
e2eTest.LegacySetupEVM(stressTestArgs.contractsDeployed, true)

// If stress test is running on local docker environment
switch stressTestArgs.network {
@@ -149,8 +149,8 @@ func StressTest(cmd *cobra.Command, _ []string) {
})

// deposit on ZetaChain
e2eTest.DepositEther()
e2eTest.DepositZeta()
e2eTest.LegacyDepositEther()
e2eTest.LegacyDepositZeta()
case "TESTNET":
ethZRC20Addr := must(e2eTest.SystemContract.GasCoinZRC20ByChainId(&bind.CallOpts{}, big.NewInt(5)))
e2eTest.ETHZRC20Addr = ethZRC20Addr
2 changes: 1 addition & 1 deletion e2e/e2etests/legacy/test_erc20_deposit.go
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ func TestERC20Deposit(r *runner.E2ERunner, args []string) {
// parse the deposit amount
amount := utils.ParseBigInt(r, args[0])

hash := r.DepositERC20WithAmountAndMessage(r.EVMAddress(), amount, []byte{})
hash := r.LegacyDepositERC20WithAmountAndMessage(r.EVMAddress(), amount, []byte{})

// wait for the cctx to be mined
cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, hash.Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
2 changes: 1 addition & 1 deletion e2e/e2etests/legacy/test_erc20_withdraw.go
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ func TestERC20Withdraw(r *runner.E2ERunner, args []string) {
r.Logger.Info("eth zrc20 approve receipt: status %d", receipt.Status)

// withdraw
tx = r.WithdrawERC20(withdrawalAmount)
tx = r.LegacyWithdrawERC20(withdrawalAmount)

// verify the withdraw value
cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
2 changes: 1 addition & 1 deletion e2e/e2etests/legacy/test_eth_deposit.go
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ func TestEtherDeposit(r *runner.E2ERunner, args []string) {
// parse the deposit amount
amount := utils.ParseBigInt(r, args[0])

hash := r.DepositEtherWithAmount(amount) // in wei
hash := r.LegacyDepositEtherWithAmount(amount) // in wei
// wait for the cctx to be mined
cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, hash.Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
r.Logger.CCTX(*cctx, "deposit")
2 changes: 1 addition & 1 deletion e2e/e2etests/legacy/test_eth_withdraw.go
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ func TestEtherWithdraw(r *runner.E2ERunner, args []string) {
r.Logger.EVMReceipt(*receipt, "approve")

// withdraw
tx = r.WithdrawEther(withdrawalAmount)
tx = r.LegacyWithdrawEther(withdrawalAmount)

// verify the withdrawal value
cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
8 changes: 4 additions & 4 deletions e2e/e2etests/legacy/test_rate_limiter.go
Original file line number Diff line number Diff line change
@@ -95,11 +95,11 @@ func createAndWaitWithdraws(r *runner.E2ERunner, withdrawType withdrawType, with
// create a new withdraw depending on the type
switch withdrawType {
case withdrawTypeZETA:
txs[i] = r.WithdrawZeta(withdrawAmount, true)
txs[i] = r.LegacyWithdrawZeta(withdrawAmount, true)
case withdrawTypeETH:
txs[i] = r.WithdrawEther(withdrawAmount)
txs[i] = r.LegacyWithdrawEther(withdrawAmount)
case withdrawTypeERC20:
txs[i] = r.WithdrawERC20(withdrawAmount)
txs[i] = r.LegacyWithdrawERC20(withdrawAmount)
default:
return fmt.Errorf("invalid withdraw type: %s", withdrawType)
}
@@ -242,7 +242,7 @@ func addZetaGasLiquidity(r *runner.E2ERunner) error {
func approveTokens(r *runner.E2ERunner) error {
// deposit and approve 50 WZETA for the tests
approveAmount := big.NewInt(0).Mul(big.NewInt(1e18), big.NewInt(50))
r.DepositAndApproveWZeta(approveAmount)
r.LegacyDepositAndApproveWZeta(approveAmount)

// approve ETH for withdraws
tx, err := r.ETHZRC20.Approve(r.ZEVMAuth, r.ETHZRC20Addr, approveAmount)
2 changes: 1 addition & 1 deletion e2e/e2etests/legacy/test_zeta_deposit.go
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ func TestZetaDeposit(r *runner.E2ERunner, args []string) {
// parse deposit amount
amount := utils.ParseBigInt(r, args[0])

hash := r.DepositZetaWithAmount(r.EVMAddress(), amount)
hash := r.LegacyDepositZetaWithAmount(r.EVMAddress(), amount)

// wait for the cctx to be mined
cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, hash.Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
2 changes: 1 addition & 1 deletion e2e/e2etests/legacy/test_zeta_deposit_new_address.go
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ func TestZetaDepositNewAddress(r *runner.E2ERunner, args []string) {
amount := utils.ParseBigInt(r, args[0])

newAddress := sample.EthAddress()
hash := r.DepositZetaWithAmount(newAddress, amount)
hash := r.LegacyDepositZetaWithAmount(newAddress, amount)

// wait for the cctx to be mined
cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, hash.Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ func TestZetaDepositRestricted(r *runner.E2ERunner, args []string) {
amount := utils.ParseBigInt(r, args[0])

// Deposit amount to restricted address
txHash := r.DepositZetaWithAmount(ethcommon.HexToAddress(sample.RestrictedEVMAddressTest), amount)
txHash := r.LegacyDepositZetaWithAmount(ethcommon.HexToAddress(sample.RestrictedEVMAddressTest), amount)

// wait for 5 zeta blocks
r.WaitForBlocks(5)
4 changes: 2 additions & 2 deletions e2e/e2etests/legacy/test_zeta_withdraw.go
Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ func TestZetaWithdraw(r *runner.E2ERunner, args []string) {
// parse withdraw amount
amount := utils.ParseBigInt(r, args[0])

r.DepositAndApproveWZeta(amount)
tx := r.WithdrawZeta(amount, true)
r.LegacyDepositAndApproveWZeta(amount)
tx := r.LegacyWithdrawZeta(amount, true)

cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
r.Logger.CCTX(*cctx, "zeta withdraw")
2 changes: 1 addition & 1 deletion e2e/e2etests/test_crosschain_swap.go
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ func TestCrosschainSwap(r *runner.E2ERunner, _ []string) {

r.Logger.Info("***** First test: ERC20 -> BTC")
// Should deposit ERC20 for swap, swap for BTC and withdraw BTC
txHash := r.DepositERC20WithAmountAndMessage(r.EVMAddress(), big.NewInt(8e7), msg)
txHash := r.LegacyDepositERC20WithAmountAndMessage(r.EVMAddress(), big.NewInt(8e7), msg)
cctx1 := utils.WaitCctxMinedByInboundHash(r.Ctx, txHash.Hex(), r.CctxClient, r.Logger, r.CctxTimeout)

// check the cctx status
2 changes: 1 addition & 1 deletion e2e/e2etests/test_deposit_and_call_out_of_gas.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ func TestDepositAndCallOutOfGas(r *runner.E2ERunner, args []string) {
require.NoError(r, err)

// perform the deposit and call to the GasConsumer contract
tx := r.V2ETHDepositAndCall(
tx := r.ETHDepositAndCall(
gasConsumerAddress,
amount,
[]byte(randomPayload(r)),
2 changes: 1 addition & 1 deletion e2e/e2etests/test_deposit_and_call_swap.go
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ func TestV2DepositAndCallSwap(r *runner.E2ERunner, _ []string) {

// perform the deposit and call
r.ApproveERC20OnEVM(r.GatewayEVMAddr)
tx = r.V2ERC20DepositAndCall(
tx = r.ERC20DepositAndCall(
r.ZEVMSwapAppAddr,
big.NewInt(8e7),
memobytes,
2 changes: 1 addition & 1 deletion e2e/e2etests/test_donation.go
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ func TestDonationEther(r *runner.E2ERunner, args []string) {
// parse the donation amount
amount := utils.ParseBigInt(r, args[0])

txDonation, err := r.SendEther(r.TSSAddress, amount, []byte(constant.DonationMessage))
txDonation, err := r.LegacySendEther(r.TSSAddress, amount, []byte(constant.DonationMessage))
require.NoError(r, err)

r.Logger.EVMTransaction(*txDonation, "donation")
2 changes: 1 addition & 1 deletion e2e/e2etests/test_erc20_deposit.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ func TestV2ERC20Deposit(r *runner.E2ERunner, args []string) {
require.NoError(r, err)

// perform the deposit
tx := r.V2ERC20Deposit(r.EVMAddress(), amount, gatewayevm.RevertOptions{OnRevertGasLimit: big.NewInt(0)})
tx := r.ERC20Deposit(r.EVMAddress(), amount, gatewayevm.RevertOptions{OnRevertGasLimit: big.NewInt(0)})

// wait for the cctx to be mined
cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
2 changes: 1 addition & 1 deletion e2e/e2etests/test_erc20_deposit_and_call.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ func TestV2ERC20DepositAndCall(r *runner.E2ERunner, args []string) {
require.NoError(r, err)

// perform the deposit
tx := r.V2ERC20DepositAndCall(
tx := r.ERC20DepositAndCall(
r.TestDAppV2ZEVMAddr,
amount,
[]byte(payload),
2 changes: 1 addition & 1 deletion e2e/e2etests/test_erc20_deposit_and_call_no_message.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ func TestV2ERC20DepositAndCallNoMessage(r *runner.E2ERunner, args []string) {
require.NoError(r, err)

// perform the deposit
tx := r.V2ERC20DepositAndCall(
tx := r.ERC20DepositAndCall(
r.TestDAppV2ZEVMAddr,
amount,
[]byte{},
2 changes: 1 addition & 1 deletion e2e/e2etests/test_erc20_deposit_and_call_revert.go
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ func TestV2ERC20DepositAndCallRevert(r *runner.E2ERunner, args []string) {
require.EqualValues(r, int64(0), balance.Int64())

// perform the deposit
tx := r.V2ERC20DepositAndCall(r.TestDAppV2ZEVMAddr, amount, []byte("revert"), gatewayevm.RevertOptions{
tx := r.ERC20DepositAndCall(r.TestDAppV2ZEVMAddr, amount, []byte("revert"), gatewayevm.RevertOptions{
RevertAddress: revertAddress,
OnRevertGasLimit: big.NewInt(0),
})
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ func TestV2ERC20DepositAndCallRevertWithCall(r *runner.E2ERunner, args []string)
r.AssertTestDAppEVMCalled(false, payload, amount)

// perform the deposit
tx := r.V2ERC20DepositAndCall(r.TestDAppV2ZEVMAddr, amount, []byte("revert"), gatewayevm.RevertOptions{
tx := r.ERC20DepositAndCall(r.TestDAppV2ZEVMAddr, amount, []byte("revert"), gatewayevm.RevertOptions{
RevertAddress: r.TestDAppV2EVMAddr,
CallOnRevert: true,
RevertMessage: []byte(payload),
2 changes: 1 addition & 1 deletion e2e/e2etests/test_erc20_deposit_restricted_address.go
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ func TestERC20DepositRestricted(r *runner.E2ERunner, args []string) {
amount := utils.ParseBigInt(r, args[0])

// deposit ERC20 to restricted address
txHash := r.DepositERC20WithAmountAndMessage(
txHash := r.LegacyDepositERC20WithAmountAndMessage(
ethcommon.HexToAddress(sample.RestrictedEVMAddressTest),
amount,
[]byte{},
2 changes: 1 addition & 1 deletion e2e/e2etests/test_erc20_withdraw.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ func TestV2ERC20Withdraw(r *runner.E2ERunner, args []string) {
r.ApproveETHZRC20(r.GatewayZEVMAddr)

// perform the withdraw
tx := r.V2ERC20Withdraw(r.EVMAddress(), amount, gatewayzevm.RevertOptions{OnRevertGasLimit: big.NewInt(0)})
tx := r.ERC20Withdraw(r.EVMAddress(), amount, gatewayzevm.RevertOptions{OnRevertGasLimit: big.NewInt(0)})

// wait for the cctx to be mined
cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
2 changes: 1 addition & 1 deletion e2e/e2etests/test_erc20_withdraw_and_arbitrary_call.go
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ func TestV2ERC20WithdrawAndArbitraryCall(r *runner.E2ERunner, args []string) {
r.ApproveETHZRC20(r.GatewayZEVMAddr)

// perform the withdraw
tx := r.V2ERC20WithdrawAndArbitraryCall(
tx := r.ERC20WithdrawAndArbitraryCall(
r.TestDAppV2EVMAddr,
amount,
r.EncodeERC20Call(r.ERC20Addr, amount, payload),
Loading

0 comments on commit cc751b5

Please sign in to comment.