Merge branch 'develop' into TT-974-chainlink-evm-workflow-call

smartcontractkit · Mar 7, 2024 · c378c94 · c378c94
2 parents a7b496a + 542cd04
commit c378c94
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git 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")
 		}
 

diff --git 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