From edb0db07cfb2f0a6603371dc8cae95203600a641 Mon Sep 17 00:00:00 2001 From: "app-token-issuer-infra-releng[bot]" <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:29:35 +0000 Subject: [PATCH] [automated] bump e2e test deps to match chainlink/integration-tests (#770) * [automated] bump e2e <> core/integration-tests dependencies * use default configuration --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aalu1418 <50029043+aalu1418@users.noreply.github.com> --- integration-tests/go.mod | 10 +++++----- integration-tests/go.sum | 16 ++++++++-------- integration-tests/testconfig/testconfig.go | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 39f1640d7..97780a4f6 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -14,11 +14,11 @@ require ( github.com/lib/pq v1.10.9 github.com/pelletier/go-toml/v2 v2.2.2 github.com/rs/zerolog v1.31.0 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625145034-72dab520f468 - github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240625135745-60e0e43656f9 - github.com/smartcontractkit/chainlink-testing-framework v1.31.5 - github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240627162800-7a3ba8ec4ab7 - github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240627162800-7a3ba8ec4ab7 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240627145530-c769d7129f16 + github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240627134229-63de1a005c44 + github.com/smartcontractkit/chainlink-testing-framework v1.31.7 + github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240628194526-3f8c00a6f188 + github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240628194526-3f8c00a6f188 github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c github.com/smartcontractkit/seth v1.0.12 github.com/stretchr/testify v1.9.0 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 7e2398116..c45bf7b41 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1407,8 +1407,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8= github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625145034-72dab520f468 h1:rhsUMdSrCerrUzzsOWaHkcb+qlB7knEAXYv/P29YUn8= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240625145034-72dab520f468/go.mod h1:L32xvCpk84Nglit64OhySPMP1tM3TTBK7Tw0qZl7Sd4= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240627145530-c769d7129f16 h1:YTE+iBNaRNZplGiiTZFYlnUrVYq1pyQr8Yiz3V3gsN8= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240627145530-c769d7129f16/go.mod h1:EWvSuqIJUYXZLEHewC7WCaPylM2jyjF3Q36BZPS4MoI= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240621143432-85370a54b141 h1:TMOoYaeSDkkI3jkCH7lKHOZaLkeDuxFTNC+XblD6M0M= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240621143432-85370a54b141/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo= @@ -1417,16 +1417,16 @@ github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917 h github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917/go.mod h1:jwVxhctE6BgLOSSsVq9wbREpZ8Ev34H+UBxeUhESZRs= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba h1:YNSlhK5mobyAaw02LPGgIEuS3lXyCTXcc6oaV2L6uUI= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240625074951-06ab5e670dba/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU= -github.com/smartcontractkit/chainlink-testing-framework v1.31.5 h1:PemXseNS74zz1Oitm1MOCeJyQSIYCFck/QsnjM1y06c= -github.com/smartcontractkit/chainlink-testing-framework v1.31.5/go.mod h1:E6uNEZhZZid9PHv6/Kq5Vn63GlO61ZcKB+/f0DKo3Q4= +github.com/smartcontractkit/chainlink-testing-framework v1.31.7 h1:Vy4ah8VAfj+Y7vVmhjvwyAO6wG+Fp2vzdkSJwJPMQO4= +github.com/smartcontractkit/chainlink-testing-framework v1.31.7/go.mod h1:E6uNEZhZZid9PHv6/Kq5Vn63GlO61ZcKB+/f0DKo3Q4= github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239 h1:Kk5OVlx/5g9q3Z3lhxytZS4/f8ds1MiNM8yaHgK3Oe8= github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240405215812-5a72bc9af239/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU= github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772 h1:LQmRsrzzaYYN3wEU1l5tWiccznhvbyGnu2N+wHSXZAo= github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= -github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240627162800-7a3ba8ec4ab7 h1:Sb/WbQ9V/DSXo+JZNaMH501A0t5a0w/NVdHn64vEkAQ= -github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240627162800-7a3ba8ec4ab7/go.mod h1:id7z7CaEAqgI6d10iXzFY0p1kzo/k3JIq6Pwl08mwao= -github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240627162800-7a3ba8ec4ab7 h1:rhEqNz6nyETIwdUMbDWLahT4gTjKRh4wmcUJ53BIOU0= -github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240627162800-7a3ba8ec4ab7/go.mod h1:Z7lmPpWkFcohrjRxO1UH0JAJChGMrtAw+4ivzIky6YY= +github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240628194526-3f8c00a6f188 h1:Mv3AcLG4oPWy+2pFSP8RNC/MYgv4xdzSxhzhYrDLRFk= +github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240628194526-3f8c00a6f188/go.mod h1:dfS7QEXweze1Rhckl9cxXGyE6Ht0POxqe0J0ND7N1tk= +github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240628194526-3f8c00a6f188 h1:Im3F/GiktNZjbznuVxUokKtbLOR+cKUCTBT84N93Nu0= +github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240628194526-3f8c00a6f188/go.mod h1:5Z7DcWYnEB7G5MRUf6EvmN+NbdTGzFxCbzjdt3WfDAE= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU= diff --git a/integration-tests/testconfig/testconfig.go b/integration-tests/testconfig/testconfig.go index 3c7e6c946..a9ee28497 100644 --- a/integration-tests/testconfig/testconfig.go +++ b/integration-tests/testconfig/testconfig.go @@ -301,7 +301,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { var handleSpecialOverrides = func(logger zerolog.Logger, filename, configurationName string, target *TestConfig, content []byte, product Product) error { switch product { default: - err := ctf_config.BytesToAnyTomlStruct(logger, filename, configurationName, &testConfig, content) + err := ctf_config.BytesToAnyTomlStruct(logger, filename, configurationName, target, content) if err != nil { return fmt.Errorf("error reading file %s: %w", filename, err) } @@ -324,7 +324,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { return TestConfig{}, fmt.Errorf("error reading embedded config: %w", err) } - err = handleSpecialOverrides(logger, fileName, configurationName, &testConfig, file, product) + err = handleSpecialOverrides(logger, fileName, "", &testConfig, file, product) // use empty configurationName to read default config if err != nil { return TestConfig{}, fmt.Errorf("error unmarshalling embedded config: %w", err) } @@ -349,7 +349,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { return TestConfig{}, fmt.Errorf("error reading file %s: %w", filePath, err) } - err = handleSpecialOverrides(logger, fileName, configurationName, &testConfig, content, product) + err = handleSpecialOverrides(logger, fileName, "", &testConfig, content, product) // use empty configurationName to read default config if err != nil { return TestConfig{}, fmt.Errorf("error reading file %s: %w", filePath, err) } @@ -364,7 +364,7 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { return TestConfig{}, err } - err = handleSpecialOverrides(logger, Base64OverrideEnvVarName, configurationName, &testConfig, decoded, product) + err = handleSpecialOverrides(logger, Base64OverrideEnvVarName, "", &testConfig, decoded, product) // use empty configurationName to read default config if err != nil { return TestConfig{}, fmt.Errorf("error unmarshaling base64 config: %w", err) }