From a5e0ff9592ff7b47c5fdb6f6f0fef7bc237529fe Mon Sep 17 00:00:00 2001 From: Tate Date: Tue, 12 Sep 2023 14:32:48 -0600 Subject: [PATCH] [TT-591] Fix E2E Test Logging In Parallel Tests --- .../actions/automation_ocr_helpers_local.go | 33 ++++++++++--------- .../actions/keeper_helpers_local.go | 13 ++++---- integration-tests/docker/test_env/cl_node.go | 8 +++-- integration-tests/docker/test_env/test_env.go | 17 ++++++---- .../docker/test_env/test_env_builder.go | 14 ++++++-- integration-tests/smoke/automation_test.go | 8 +++-- integration-tests/smoke/cron_test.go | 1 + integration-tests/smoke/flux_test.go | 1 + integration-tests/smoke/forwarder_ocr_test.go | 1 + .../smoke/forwarders_ocr2_test.go | 1 + integration-tests/smoke/keeper_test.go | 31 +++++++++-------- integration-tests/smoke/ocr2_test.go | 1 + integration-tests/smoke/ocr_test.go | 1 + integration-tests/smoke/runlog_test.go | 1 + integration-tests/smoke/vrf_test.go | 1 + 15 files changed, 81 insertions(+), 51 deletions(-) diff --git a/integration-tests/actions/automation_ocr_helpers_local.go b/integration-tests/actions/automation_ocr_helpers_local.go index dce55e42275..86738b0247d 100644 --- a/integration-tests/actions/automation_ocr_helpers_local.go +++ b/integration-tests/actions/automation_ocr_helpers_local.go @@ -4,17 +4,14 @@ package actions import ( "encoding/json" "fmt" - "testing" "time" "github.com/ethereum/go-ethereum/common" "github.com/lib/pq" "github.com/pkg/errors" - "github.com/rs/zerolog/log" - "github.com/stretchr/testify/require" + "github.com/rs/zerolog" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/chainlink-testing-framework/utils" "github.com/smartcontractkit/chainlink/integration-tests/client" "github.com/smartcontractkit/chainlink/integration-tests/contracts" "github.com/smartcontractkit/chainlink/integration-tests/contracts/ethereum" @@ -30,24 +27,23 @@ import ( ) func BuildAutoOCR2ConfigVarsLocal( - t *testing.T, + l zerolog.Logger, chainlinkNodes []*client.ChainlinkClient, registryConfig contracts.KeeperRegistrySettings, registrar string, deltaStage time.Duration, ) (contracts.OCRv2Config, error) { - return BuildAutoOCR2ConfigVarsWithKeyIndexLocal(t, chainlinkNodes, registryConfig, registrar, deltaStage, 0) + return BuildAutoOCR2ConfigVarsWithKeyIndexLocal(l, chainlinkNodes, registryConfig, registrar, deltaStage, 0) } func BuildAutoOCR2ConfigVarsWithKeyIndexLocal( - t *testing.T, + l zerolog.Logger, chainlinkNodes []*client.ChainlinkClient, registryConfig contracts.KeeperRegistrySettings, registrar string, deltaStage time.Duration, keyIndex int, ) (contracts.OCRv2Config, error) { - l := utils.GetTestLogger(t) S, oracleIdentities, err := GetOracleIdentitiesWithKeyIndexLocal(chainlinkNodes, keyIndex) if err != nil { return contracts.OCRv2Config{}, err @@ -136,13 +132,17 @@ func BuildAutoOCR2ConfigVarsWithKeyIndexLocal( var signers []common.Address for _, signer := range signerOnchainPublicKeys { - require.Equal(t, 20, len(signer), "OnChainPublicKey '%v' has wrong length for address", signer) + if len(signer) != 20 { + return contracts.OCRv2Config{}, fmt.Errorf("OnChainPublicKey '%v' has wrong length for address", signer) + } signers = append(signers, common.BytesToAddress(signer)) } var transmitters []common.Address for _, transmitter := range transmitterAccounts { - require.True(t, common.IsHexAddress(string(transmitter)), "TransmitAccount '%s' is not a valid Ethereum address", string(transmitter)) + if !common.IsHexAddress(string(transmitter)) { + return contracts.OCRv2Config{}, fmt.Errorf("TransmitAccount '%s' is not a valid Ethereum address", string(transmitter)) + } transmitters = append(transmitters, common.HexToAddress(string(transmitter))) } @@ -164,6 +164,7 @@ func BuildAutoOCR2ConfigVarsWithKeyIndexLocal( // CreateOCRKeeperJobs bootstraps the first node and to the other nodes sends ocr jobs func CreateOCRKeeperJobsLocal( + l zerolog.Logger, chainlinkNodes []*client.ChainlinkClient, registryAddr string, chainID int64, @@ -173,7 +174,7 @@ func CreateOCRKeeperJobsLocal( bootstrapNode := chainlinkNodes[0] bootstrapP2PIds, err := bootstrapNode.MustReadP2PKeys() if err != nil { - log.Error().Err(err).Msg("Shouldn't fail reading P2P keys from bootstrap node") + l.Error().Err(err).Msg("Shouldn't fail reading P2P keys from bootstrap node") return err } bootstrapP2PId := bootstrapP2PIds.Data[0].Attributes.PeerID @@ -201,7 +202,7 @@ func CreateOCRKeeperJobsLocal( } _, err = bootstrapNode.MustCreateJob(bootstrapSpec) if err != nil { - log.Error().Err(err).Msg("Shouldn't fail creating bootstrap job on bootstrap node") + l.Error().Err(err).Msg("Shouldn't fail creating bootstrap job on bootstrap node") return err } @@ -209,12 +210,12 @@ func CreateOCRKeeperJobsLocal( for nodeIndex := 1; nodeIndex < len(chainlinkNodes); nodeIndex++ { nodeTransmitterAddress, err := chainlinkNodes[nodeIndex].EthAddresses() if err != nil { - log.Error().Err(err).Msgf("Shouldn't fail getting primary ETH address from OCR node %d", nodeIndex+1) + l.Error().Err(err).Msgf("Shouldn't fail getting primary ETH address from OCR node %d", nodeIndex+1) return err } nodeOCRKeys, err := chainlinkNodes[nodeIndex].MustReadOCR2Keys() if err != nil { - log.Error().Err(err).Msgf("Shouldn't fail getting OCR keys from OCR node %d", nodeIndex+1) + l.Error().Err(err).Msgf("Shouldn't fail getting OCR keys from OCR node %d", nodeIndex+1) return err } var nodeOCRKeyId []string @@ -248,11 +249,11 @@ func CreateOCRKeeperJobsLocal( _, err = chainlinkNodes[nodeIndex].MustCreateJob(&autoOCR2JobSpec) if err != nil { - log.Error().Err(err).Msgf("Shouldn't fail creating OCR Task job on OCR node %d err: %+v", nodeIndex+1, err) + l.Error().Err(err).Msgf("Shouldn't fail creating OCR Task job on OCR node %d err: %+v", nodeIndex+1, err) return err } } - log.Info().Msg("Done creating OCR automation jobs") + l.Info().Msg("Done creating OCR automation jobs") return nil } diff --git a/integration-tests/actions/keeper_helpers_local.go b/integration-tests/actions/keeper_helpers_local.go index 6fc7ef43dbe..88d68e73282 100644 --- a/integration-tests/actions/keeper_helpers_local.go +++ b/integration-tests/actions/keeper_helpers_local.go @@ -3,12 +3,13 @@ package actions import ( "fmt" - "github.com/rs/zerolog/log" + "github.com/rs/zerolog" "github.com/smartcontractkit/chainlink/integration-tests/client" "github.com/smartcontractkit/chainlink/integration-tests/contracts" ) func CreateKeeperJobsLocal( + l zerolog.Logger, chainlinkNodes []*client.ChainlinkClient, keeperRegistry contracts.KeeperRegistry, ocrConfig contracts.OCRv2Config, @@ -17,12 +18,12 @@ func CreateKeeperJobsLocal( primaryNode := chainlinkNodes[0] primaryNodeAddress, err := primaryNode.PrimaryEthAddress() if err != nil { - log.Error().Err(err).Msg("Reading ETH Keys from Chainlink Client shouldn't fail") + l.Error().Err(err).Msg("Reading ETH Keys from Chainlink Client shouldn't fail") return nil, err } nodeAddresses, err := ChainlinkNodeAddressesLocal(chainlinkNodes) if err != nil { - log.Error().Err(err).Msg("Retrieving on-chain wallet addresses for chainlink nodes shouldn't fail") + l.Error().Err(err).Msg("Retrieving on-chain wallet addresses for chainlink nodes shouldn't fail") return nil, err } nodeAddressesStr, payees := make([]string, 0), make([]string, 0) @@ -32,14 +33,14 @@ func CreateKeeperJobsLocal( } err = keeperRegistry.SetKeepers(nodeAddressesStr, payees, ocrConfig) if err != nil { - log.Error().Err(err).Msg("Setting keepers in the registry shouldn't fail") + l.Error().Err(err).Msg("Setting keepers in the registry shouldn't fail") return nil, err } jobs := []*client.Job{} for _, chainlinkNode := range chainlinkNodes { chainlinkNodeAddress, err := chainlinkNode.PrimaryEthAddress() if err != nil { - log.Error().Err(err).Msg("Error retrieving chainlink node address") + l.Error().Err(err).Msg("Error retrieving chainlink node address") return nil, err } job, err := chainlinkNode.MustCreateJob(&client.KeeperJobSpec{ @@ -49,7 +50,7 @@ func CreateKeeperJobsLocal( MinIncomingConfirmations: 1, }) if err != nil { - log.Error().Err(err).Msg("Creating KeeperV2 Job shouldn't fail") + l.Error().Err(err).Msg("Creating KeeperV2 Job shouldn't fail") return nil, err } jobs = append(jobs, job) diff --git a/integration-tests/docker/test_env/cl_node.go b/integration-tests/docker/test_env/cl_node.go index 4c2213b03ee..f729cccbc0e 100644 --- a/integration-tests/docker/test_env/cl_node.go +++ b/integration-tests/docker/test_env/cl_node.go @@ -17,7 +17,7 @@ import ( "github.com/google/uuid" "github.com/pelletier/go-toml/v2" "github.com/pkg/errors" - "github.com/rs/zerolog/log" + "github.com/rs/zerolog" tc "github.com/testcontainers/testcontainers-go" tcwait "github.com/testcontainers/testcontainers-go/wait" @@ -48,6 +48,7 @@ type ClNode struct { lw *logwatch.LogWatch ContainerImage string ContainerVersion string + l zerolog.Logger } type ClNodeOption = func(c *ClNode) @@ -76,7 +77,7 @@ func WithLogWatch(lw *logwatch.LogWatch) ClNodeOption { } } -func NewClNode(networks []string, nodeConfig *chainlink.Config, opts ...ClNodeOption) *ClNode { +func NewClNode(networks []string, nodeConfig *chainlink.Config, logger zerolog.Logger, opts ...ClNodeOption) *ClNode { nodeDefaultCName := fmt.Sprintf("%s-%s", "cl-node", uuid.NewString()[0:8]) pgDefaultCName := fmt.Sprintf("pg-%s", nodeDefaultCName) pgDb := test_env.NewPostgresDb(networks, test_env.WithPostgresDbContainerName(pgDefaultCName)) @@ -87,6 +88,7 @@ func NewClNode(networks []string, nodeConfig *chainlink.Config, opts ...ClNodeOp }, NodeConfig: nodeConfig, PostgresDb: pgDb, + l: logger, } for _, opt := range opts { opt(n) @@ -258,7 +260,7 @@ func (n *ClNode) StartContainer() error { if err != nil { return err } - log.Info().Str("containerName", n.ContainerName). + n.l.Info().Str("containerName", n.ContainerName). Str("clEndpoint", clEndpoint). Str("clInternalIP", ip). Msg("Started Chainlink Node container") diff --git a/integration-tests/docker/test_env/test_env.go b/integration-tests/docker/test_env/test_env.go index e90bf5618ab..513372795d6 100644 --- a/integration-tests/docker/test_env/test_env.go +++ b/integration-tests/docker/test_env/test_env.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/keystore" "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/rs/zerolog/log" + "github.com/rs/zerolog" tc "github.com/testcontainers/testcontainers-go" "golang.org/x/sync/errgroup" @@ -40,9 +40,10 @@ type CLClusterTestEnv struct { EVMClient blockchain.EVMClient ContractDeployer contracts.ContractDeployer ContractLoader contracts.ContractLoader + l zerolog.Logger } -func NewTestEnv() (*CLClusterTestEnv, error) { +func NewTestEnv(l zerolog.Logger) (*CLClusterTestEnv, error) { utils.SetupCoreDockerEnvLogger() network, err := docker.CreateNetwork() if err != nil { @@ -53,22 +54,24 @@ func NewTestEnv() (*CLClusterTestEnv, error) { Network: network, Geth: test_env.NewGeth(networks), MockServer: test_env.NewMockServer(networks), + l: l, }, nil } -func NewTestEnvFromCfg(cfg *TestEnvConfig) (*CLClusterTestEnv, error) { +func NewTestEnvFromCfg(l zerolog.Logger, cfg *TestEnvConfig) (*CLClusterTestEnv, error) { utils.SetupCoreDockerEnvLogger() network, err := docker.CreateNetwork() if err != nil { return nil, err } networks := []string{network.Name} - log.Info().Interface("Cfg", cfg).Send() + l.Info().Interface("Cfg", cfg).Send() return &CLClusterTestEnv{ Cfg: cfg, Network: network, Geth: test_env.NewGeth(networks, test_env.WithContainerName(cfg.Geth.ContainerName)), MockServer: test_env.NewMockServer(networks, test_env.WithContainerName(cfg.MockServer.ContainerName)), + l: l, }, nil } @@ -130,7 +133,7 @@ func (te *CLClusterTestEnv) StartClNodes(nodeConfig *chainlink.Config, count int nodeContainerName = te.Cfg.Nodes[nodeIndex].NodeContainerName dbContainerName = te.Cfg.Nodes[nodeIndex].DbContainerName } - n := NewClNode([]string{te.Network.Name}, nodeConfig, + n := NewClNode([]string{te.Network.Name}, nodeConfig, te.l, WithNodeContainerName(nodeContainerName), WithDbContainerName(dbContainerName), ) @@ -199,7 +202,7 @@ func (te *CLClusterTestEnv) Terminate() error { // Cleanup cleans the environment up after it's done being used, mainly for returning funds when on live networks. // Intended to be used as part of t.Cleanup() in tests. func (te *CLClusterTestEnv) Cleanup() error { - log.Info().Msg("Attempting to return Chainlink node funds to default network wallets") + te.l.Info().Msg("Attempting to return Chainlink node funds to default network wallets") if te.EVMClient == nil { return errors.New("blockchain client is nil, unable to return funds from chainlink nodes") } @@ -207,7 +210,7 @@ func (te *CLClusterTestEnv) Cleanup() error { return errors.New("chainlink nodes are nil, unable to return funds from chainlink nodes") } if te.EVMClient.NetworkSimulated() { - log.Info().Str("Network Name", te.EVMClient.GetNetworkName()). + te.l.Info().Str("Network Name", te.EVMClient.GetNetworkName()). Msg("Network is a simulated network. Skipping fund return.") return nil } diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go index 156ee0a9b8d..e263e41ec89 100644 --- a/integration-tests/docker/test_env/test_env_builder.go +++ b/integration-tests/docker/test_env/test_env_builder.go @@ -5,6 +5,7 @@ import ( "os" "github.com/pkg/errors" + "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/smartcontractkit/chainlink-testing-framework/blockchain" @@ -29,6 +30,7 @@ type CLTestEnvBuilder struct { externalAdapterCount int customNodeCsaKeys []string defaultNodeCsaKeys []string + l zerolog.Logger /* funding */ ETHFunds *big.Float @@ -37,9 +39,15 @@ type CLTestEnvBuilder struct { func NewCLTestEnvBuilder() *CLTestEnvBuilder { return &CLTestEnvBuilder{ externalAdapterCount: 1, + l: log.Logger, } } +func (b *CLTestEnvBuilder) WithLogger(l zerolog.Logger) *CLTestEnvBuilder { + b.l = l + return b +} + func (b *CLTestEnvBuilder) WithLogWatcher() *CLTestEnvBuilder { b.hasLogWatch = true return b @@ -95,7 +103,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { } func (b *CLTestEnvBuilder) buildNewEnv(cfg *TestEnvConfig) (*CLClusterTestEnv, error) { - log.Info(). + b.l.Info(). Bool("hasGeth", b.hasGeth). Bool("hasMockServer", b.hasMockServer). Int("externalAdapterCount", b.externalAdapterCount). @@ -107,12 +115,12 @@ func (b *CLTestEnvBuilder) buildNewEnv(cfg *TestEnvConfig) (*CLClusterTestEnv, e var te *CLClusterTestEnv var err error if cfg != nil { - te, err = NewTestEnvFromCfg(cfg) + te, err = NewTestEnvFromCfg(b.l, cfg) if err != nil { return nil, err } } else { - te, err = NewTestEnv() + te, err = NewTestEnv(b.l) if err != nil { return nil, err } diff --git a/integration-tests/smoke/automation_test.go b/integration-tests/smoke/automation_test.go index 63d52d326ba..6b74ed23a40 100644 --- a/integration-tests/smoke/automation_test.go +++ b/integration-tests/smoke/automation_test.go @@ -882,7 +882,7 @@ func TestAutomationCheckPerformGasLimit(t *testing.T) { highCheckGasLimit := automationDefaultRegistryConfig highCheckGasLimit.CheckGasLimit = uint32(5000000) highCheckGasLimit.RegistryVersion = registryVersion - ocrConfig, err := actions.BuildAutoOCR2ConfigVarsLocal(t, nodesWithoutBootstrap, highCheckGasLimit, registrar.Address(), 30*time.Second) + ocrConfig, err := actions.BuildAutoOCR2ConfigVarsLocal(l, nodesWithoutBootstrap, highCheckGasLimit, registrar.Address(), 30*time.Second) require.NoError(t, err, "Error building OCR config") err = registry.SetConfig(highCheckGasLimit, ocrConfig) @@ -990,6 +990,7 @@ func setupAutomationTestDocker( contracts.KeeperRegistrar, *test_env.CLClusterTestEnv, ) { + l := utils.GetTestLogger(t) // Add registry version to config registryConfig.RegistryVersion = registryVersion network := networks.SelectedNetwork @@ -1008,6 +1009,7 @@ func setupAutomationTestDocker( // launch the environment env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodes(5). @@ -1040,9 +1042,9 @@ func setupAutomationTestDocker( err = linkToken.Transfer(registry.Address(), big.NewInt(0).Mul(big.NewInt(1e18), big.NewInt(int64(defaultAmountOfUpkeeps)))) require.NoError(t, err, "Funding keeper registry contract shouldn't fail") - err = actions.CreateOCRKeeperJobsLocal(nodeClients, registry.Address(), network.ChainID, 0, registryVersion) + err = actions.CreateOCRKeeperJobsLocal(l, nodeClients, registry.Address(), network.ChainID, 0, registryVersion) require.NoError(t, err, "Error creating OCR Keeper Jobs") - ocrConfig, err := actions.BuildAutoOCR2ConfigVarsLocal(t, workerNodes, registryConfig, registrar.Address(), 30*time.Second) + ocrConfig, err := actions.BuildAutoOCR2ConfigVarsLocal(l, workerNodes, registryConfig, registrar.Address(), 30*time.Second) require.NoError(t, err, "Error building OCR config vars") err = registry.SetConfig(automationDefaultRegistryConfig, ocrConfig) require.NoError(t, err, "Registry config should be set successfully") diff --git a/integration-tests/smoke/cron_test.go b/integration-tests/smoke/cron_test.go index 0285e2d23c7..36895239af9 100644 --- a/integration-tests/smoke/cron_test.go +++ b/integration-tests/smoke/cron_test.go @@ -19,6 +19,7 @@ func TestCronBasic(t *testing.T) { l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodes(1). diff --git a/integration-tests/smoke/flux_test.go b/integration-tests/smoke/flux_test.go index c4cd02b857d..8106f5d89a7 100644 --- a/integration-tests/smoke/flux_test.go +++ b/integration-tests/smoke/flux_test.go @@ -25,6 +25,7 @@ func TestFluxBasic(t *testing.T) { l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodes(3). diff --git a/integration-tests/smoke/forwarder_ocr_test.go b/integration-tests/smoke/forwarder_ocr_test.go index e4cf5cb0527..1d4efdbfb4e 100644 --- a/integration-tests/smoke/forwarder_ocr_test.go +++ b/integration-tests/smoke/forwarder_ocr_test.go @@ -19,6 +19,7 @@ func TestForwarderOCRBasic(t *testing.T) { l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithForwarders(). diff --git a/integration-tests/smoke/forwarders_ocr2_test.go b/integration-tests/smoke/forwarders_ocr2_test.go index bf422b30faa..3361e717899 100644 --- a/integration-tests/smoke/forwarders_ocr2_test.go +++ b/integration-tests/smoke/forwarders_ocr2_test.go @@ -22,6 +22,7 @@ func TestForwarderOCR2Basic(t *testing.T) { l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(), diff --git a/integration-tests/smoke/keeper_test.go b/integration-tests/smoke/keeper_test.go index 35bb632c113..d4a2bd5a4b7 100644 --- a/integration-tests/smoke/keeper_test.go +++ b/integration-tests/smoke/keeper_test.go @@ -100,7 +100,7 @@ func TestKeeperBasicSmoke(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -176,7 +176,7 @@ func TestKeeperBlockCountPerTurn(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -265,6 +265,7 @@ func TestKeeperSimulation(t *testing.T) { registryVersion := rv t.Run(fmt.Sprintf("registry_1_%d", registryVersion), func(t *testing.T) { t.Parallel() + l := utils.GetTestLogger(t) chainClient, chainlinkNodes, contractDeployer, linkToken, _ := setupKeeperTest(t) registry, _, consumersPerformance, upkeepIDs := actions.DeployPerformanceKeeperContracts( t, @@ -283,7 +284,7 @@ func TestKeeperSimulation(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -356,7 +357,7 @@ func TestKeeperCheckPerformGasLimit(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -465,7 +466,7 @@ func TestKeeperRegisterUpkeep(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -539,6 +540,7 @@ func TestKeeperAddFunds(t *testing.T) { registryVersion := rv t.Run(fmt.Sprintf("registry_1_%d", registryVersion), func(t *testing.T) { t.Parallel() + l := utils.GetTestLogger(t) chainClient, chainlinkNodes, contractDeployer, linkToken, _ := setupKeeperTest(t) registry, _, consumers, upkeepIDs := actions.DeployKeeperContracts( t, @@ -553,7 +555,7 @@ func TestKeeperAddFunds(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -616,7 +618,7 @@ func TestKeeperRemove(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -679,6 +681,7 @@ func TestKeeperPauseRegistry(t *testing.T) { registryVersion := rv t.Run(fmt.Sprintf("registry_1_%d", registryVersion), func(t *testing.T) { t.Parallel() + l := utils.GetTestLogger(t) chainClient, chainlinkNodes, contractDeployer, linkToken, _ := setupKeeperTest(t) registry, _, consumers, upkeepIDs := actions.DeployKeeperContracts( t, @@ -693,7 +696,7 @@ func TestKeeperPauseRegistry(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -739,6 +742,7 @@ func TestKeeperPauseRegistry(t *testing.T) { func TestKeeperMigrateRegistry(t *testing.T) { t.Parallel() + l := utils.GetTestLogger(t) chainClient, chainlinkNodes, contractDeployer, linkToken, _ := setupKeeperTest(t) registry, _, consumers, upkeepIDs := actions.DeployKeeperContracts( t, @@ -753,7 +757,7 @@ func TestKeeperMigrateRegistry(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -772,7 +776,7 @@ func TestKeeperMigrateRegistry(t *testing.T) { ) // Set the jobs for the second registry - _, err = actions.CreateKeeperJobsLocal(chainlinkNodes, secondRegistry, contracts.OCRv2Config{}) + _, err = actions.CreateKeeperJobsLocal(l, chainlinkNodes, secondRegistry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -845,7 +849,7 @@ func TestKeeperNodeDown(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - jobs, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + jobs, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -951,7 +955,7 @@ func TestKeeperPauseUnPauseUpkeep(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -1042,7 +1046,7 @@ func TestKeeperUpdateCheckData(t *testing.T) { ) gom := gomega.NewGomegaWithT(t) - _, err := actions.CreateKeeperJobsLocal(chainlinkNodes, registry, contracts.OCRv2Config{}) + _, err := actions.CreateKeeperJobsLocal(l, chainlinkNodes, registry, contracts.OCRv2Config{}) require.NoError(t, err, "Error creating keeper jobs") err = chainClient.WaitForEvents() require.NoError(t, err, "Error creating keeper jobs") @@ -1103,6 +1107,7 @@ func setupKeeperTest(t *testing.T) ( l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodes(5). diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go index 36d53b40676..b173b8f594a 100644 --- a/integration-tests/smoke/ocr2_test.go +++ b/integration-tests/smoke/ocr2_test.go @@ -32,6 +32,7 @@ func TestOCRv2Basic(t *testing.T) { l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(), diff --git a/integration-tests/smoke/ocr_test.go b/integration-tests/smoke/ocr_test.go index 50d6abe662b..070072e4d19 100644 --- a/integration-tests/smoke/ocr_test.go +++ b/integration-tests/smoke/ocr_test.go @@ -18,6 +18,7 @@ func TestOCRBasic(t *testing.T) { l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodes(6). diff --git a/integration-tests/smoke/runlog_test.go b/integration-tests/smoke/runlog_test.go index cd2a099b142..f79f9f266bb 100644 --- a/integration-tests/smoke/runlog_test.go +++ b/integration-tests/smoke/runlog_test.go @@ -22,6 +22,7 @@ func TestRunLogBasic(t *testing.T) { l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodes(1). diff --git a/integration-tests/smoke/vrf_test.go b/integration-tests/smoke/vrf_test.go index 0e12b185a6a..d4d980ec223 100644 --- a/integration-tests/smoke/vrf_test.go +++ b/integration-tests/smoke/vrf_test.go @@ -24,6 +24,7 @@ func TestVRFBasic(t *testing.T) { l := utils.GetTestLogger(t) env, err := test_env.NewCLTestEnvBuilder(). + WithLogger(l). WithGeth(). WithMockServer(1). WithCLNodes(1).