Skip to content

Commit

Permalink
chore: update e2e local config
Browse files Browse the repository at this point in the history
  • Loading branch information
gartnera committed Jul 29, 2024
1 parent 22c7395 commit 2c36808
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
12 changes: 6 additions & 6 deletions cmd/zetae2e/config/clients.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ func getClientsFromConfig(ctx context.Context, conf config.Config, account confi
E2EClients,
error,
) {
if conf.RPCs.Solana == "" {
return E2EClients{}, fmt.Errorf("solana rpc is empty")
}
solanaClient := rpc.New(conf.RPCs.Solana)
if solanaClient == nil {
return E2EClients{}, fmt.Errorf("failed to get solana client")
var solanaClient *rpc.Client
if conf.RPCs.Solana != "" {
solanaClient = rpc.New(conf.RPCs.Solana)
if solanaClient == nil {
return E2EClients{}, fmt.Errorf("failed to get solana client")
}
}
btcRPCClient, err := getBtcClient(conf.RPCs.Bitcoin)
if err != nil {
Expand Down
11 changes: 6 additions & 5 deletions cmd/zetae2e/config/local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ default_account:
evm_address: "0xE5C5367B8224807Ac2207d350E60e1b6F27a7ecC"
private_key: "d87baf7bf6dc560a252596678c12e41f7d1682837f05b29d411bc3f78ae2c263"
rpcs:
zevm: "http://0.0.0.0:9545"
evm: "http://0.0.0.0:8545"
zevm: "http://localhost:9545"
evm: "http://localhost:8545"
bitcoin:
host: "0.0.0.0:18443"
host: "localhost:18443"
user: "smoketest"
pass: "123"
http_post_mode: true
disable_tls: true
params: regnet
zetacore_grpc: "0.0.0.0:9090"
zetacore_rpc: "http://0.0.0.0:26657"
zetacore_grpc: "localhost:9090"
zetacore_rpc: "http://localhost:26657"
solana: "http://solana:8899"
contracts:
zevm:
system_contract: "0x91d18e54DAf4F677cB28167158d6dd21F6aB3921"
Expand Down
4 changes: 4 additions & 0 deletions cmd/zetae2e/local/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,10 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
eg.Go(miscTestRoutine(conf, deployerRunner, verbose, e2etests.TestMyTestName))
}
if testSolana {
if deployerRunner.SolanaClient == nil {
logger.Print("❌ solana client is nil, maybe solana rpc is not set")
os.Exit(1)
}
eg.Go(solanaTestRoutine(conf, deployerRunner, verbose, e2etests.TestSolanaDepositName))
}

Expand Down

0 comments on commit 2c36808

Please sign in to comment.