From 3289bb1d754f48290f03349dc434dda72818e4ac Mon Sep 17 00:00:00 2001 From: skosito Date: Wed, 28 Feb 2024 16:00:01 +0100 Subject: [PATCH] Remove test list from config --- cmd/zetae2e/README.md | 16 +--------------- cmd/zetae2e/config/example.yml | 5 ----- e2e/config/config.go | 1 - e2e/e2etests/e2etests.go | 2 +- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/cmd/zetae2e/README.md b/cmd/zetae2e/README.md index 7ef33956e6..e53c78eb3c 100644 --- a/cmd/zetae2e/README.md +++ b/cmd/zetae2e/README.md @@ -52,11 +52,6 @@ contracts: connector_eth: "0x00005e3125aba53c5652f9f0ce1a4cf91d8b15ea" custody: "0x000047f11c6e42293f433c82473532e869ce4ec5" usdt: "0x07865c6e87b9f70255377e024ace6630c1eaa37f" -test_list: -# - "erc20_deposit" -# - "erc20_withdraw" -# - "eth_deposit" -# - "eth_withdraw" ``` ### Bitcoin setup @@ -95,7 +90,7 @@ zetae2e list-tests Run tests: ```go -zetae2e run [config] --verbose +zetae2e run [testname1]:[arg1],[arg2] [testname2]:[arg1],[arg2] --config config.yml ``` Since cctxs might take a longer time to be processed on live networks, it is highly recommended to use `--verbose` flag to see the current status of the cctx workflow. @@ -124,9 +119,6 @@ contracts: zeta_eth connector_eth custody: "0x000047f11c6e42293f433c82473532e869ce4ec5" -test_list: - - "eth_deposit" - - "eth_withdraw" ``` One of the tests can be commented out in case only a deposit or a withdrawal is to be tested. @@ -151,9 +143,6 @@ contracts: usdt_zrc20 evm: usdt -test_list: - - "erc20_deposit" - - "erc20_withdraw" ``` ### Testing a ZRC20 from a Bitcoin chain @@ -182,9 +171,6 @@ contracts: btc_zrc20 uniswap_factory uniswap_router -test_list: - - "bitcoin_deposit" - - "bitcoin_withdraw" ``` ### TODO: message passing \ No newline at end of file diff --git a/cmd/zetae2e/config/example.yml b/cmd/zetae2e/config/example.yml index af38812323..4381834a7f 100644 --- a/cmd/zetae2e/config/example.yml +++ b/cmd/zetae2e/config/example.yml @@ -27,9 +27,4 @@ contracts: connector_eth: "0x00005e3125aba53c5652f9f0ce1a4cf91d8b15ea" custody: "0x000047f11c6e42293f433c82473532e869ce4ec5" usdt: "0x07865c6e87b9f70255377e024ace6630c1eaa37f" -test_list: -# - "erc20_deposit" -# - "erc20_withdraw" -# - "eth_deposit" -# - "eth_withdraw" diff --git a/e2e/config/config.go b/e2e/config/config.go index 46281b5558..5eebd5fc68 100644 --- a/e2e/config/config.go +++ b/e2e/config/config.go @@ -16,7 +16,6 @@ type Config struct { RPCs RPCs `yaml:"rpcs"` Contracts Contracts `yaml:"contracts"` ZetaChainID string `yaml:"zeta_chain_id"` - TestList []string `yaml:"test_list"` } // Accounts contains the configuration for the accounts diff --git a/e2e/e2etests/e2etests.go b/e2e/e2etests/e2etests.go index e8320d8a72..05604c7277 100644 --- a/e2e/e2etests/e2etests.go +++ b/e2e/e2etests/e2etests.go @@ -64,7 +64,7 @@ var AllE2ETests = []runner.E2ETest{ runner.NewE2ETest(TestDepositEtherLiquidityCapName, "deposit Ethers into ZEVM with a liquidity cap", "", nil, TestDepositEtherLiquidityCap), runner.NewE2ETest(TestMyTestName, "performing custom test", "", nil, TestMyTest), runner.NewE2ETest(TestERC20DepositName, "deposit ERC20 into ZEVM", "", nil, TestERC20Deposit), - runner.NewE2ETest(TestEtherDepositName, "deposit Ether into ZEVM", "", nil, TestEtherDeposit), + runner.NewE2ETest(TestEtherDepositName, "deposit Ether into ZEVM", "deposit amount (0.01ETH default)", nil, TestEtherDeposit), runner.NewE2ETest(TestEtherWithdrawName, "withdraw Ether from ZEVM", "", nil, TestEtherWithdraw), runner.NewE2ETest(TestBitcoinDepositName, "deposit Bitcoin into ZEVM", "", nil, TestBitcoinDeposit), runner.NewE2ETest(TestDonationEtherName, "donate Ether to the TSS", "", nil, TestDonationEther),