From b2cca3dfc582ebb7af2fa904ad579251be4f620c Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Thu, 7 Mar 2024 16:13:15 +0100 Subject: [PATCH 1/2] fix when network is set to be simulated in test env builder (#12335) --- integration-tests/docker/test_env/test_env_builder.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go index cfe10d1f783..127ec921ef7 100644 --- a/integration-tests/docker/test_env/test_env_builder.go +++ b/integration-tests/docker/test_env/test_env_builder.go @@ -331,6 +331,9 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { if err != nil { return nil, err } + + b.te.isSimulatedNetwork = true + return b.te, nil } @@ -395,8 +398,6 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { b.te.SethClient = seth } - - b.te.isSimulatedNetwork = true } var nodeCsaKeys []string @@ -433,8 +434,6 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { } } } - - b.te.isSimulatedNetwork = true } err := b.te.StartClCluster(cfg, b.clNodesCount, b.secretsConfig, b.testConfig, b.clNodesOpts...) @@ -462,8 +461,6 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { return nil, err } } - - b.te.isSimulatedNetwork = true } var enDesc string From 542cd04ba5ed8e5ebc35fd2dc55a8836107e8352 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Thu, 7 Mar 2024 16:36:52 +0100 Subject: [PATCH 2/2] fix nil pointer when there's no receipt (#12334) --- integration-tests/actions/seth/actions.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/integration-tests/actions/seth/actions.go b/integration-tests/actions/seth/actions.go index ac536ac2f97..ae5016852fe 100644 --- a/integration-tests/actions/seth/actions.go +++ b/integration-tests/actions/seth/actions.go @@ -71,10 +71,16 @@ func FundChainlinkNodes( }) if err != nil { fundingErrors = append(fundingErrors, err) - logger.Warn(). + + txHash := "(none)" + if receipt != nil { + txHash = receipt.TxHash.String() + } + + logger.Err(err). Str("From", fromAddress.Hex()). Str("To", toAddress). - Str("TxHash", receipt.TxHash.String()). + Str("TxHash", txHash). Msg("Failed to fund Chainlink node") }