diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 3c0e79cc4..9478a2c8a 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -16,10 +16,10 @@ require ( github.com/rs/zerolog v1.33.0 github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8 github.com/smartcontractkit/chainlink-solana v1.1.1-0.20240821170223-a2f5c39f457f - github.com/smartcontractkit/chainlink-testing-framework v1.34.10 + github.com/smartcontractkit/chainlink-testing-framework v1.35.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.2.1 - github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240829192404-674eac31cc16 - github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240829192404-674eac31cc16 + github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240902145730-2d77ff4623d0 + github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240902145730-2d77ff4623d0 github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.28.0 @@ -377,7 +377,7 @@ require ( github.com/slack-go/slack v0.12.2 // indirect github.com/smartcontractkit/chain-selectors v1.0.21 // indirect github.com/smartcontractkit/chainlink-automation v1.0.4 // indirect - github.com/smartcontractkit/chainlink-ccip v0.0.0-20240806144315-04ac101e9c95 // indirect + github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b // indirect github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 // indirect github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240820130645-cf4b159fbba2 // indirect github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 5c80f7591..c0b796ce2 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1388,8 +1388,8 @@ github.com/smartcontractkit/chain-selectors v1.0.21 h1:KCR9SA7PhOexaBzFieHoLv1Wo github.com/smartcontractkit/chain-selectors v1.0.21/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-ccip v0.0.0-20240806144315-04ac101e9c95 h1:LAgJTg9Yr/uCo2g7Krp88Dco2U45Y6sbJVl8uKoLkys= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20240806144315-04ac101e9c95/go.mod h1:/ZWraCBaDDgaIN1prixYcbVvIk/6HeED9+8zbWQ+TMo= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b h1:v1RnZVfUoHIm/lwIqRAH4eDRNTu+N+AtQE5Ik4U9hsU= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20240828115624-442f1cff195b/go.mod h1:Z9lQ5t20kRk28pzRLnqAJZUVOw8E6/siA3P3MLyKqoM= github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8 h1:MOFuL1J4/rRcR0x09qSlOsKIiq4I7YzbZcQ421KqUZA= github.com/smartcontractkit/chainlink-common v0.2.2-0.20240829145110-4a45c426fbe8/go.mod h1:TJSY2ETKiXLRPvGHNO7Dp1tlpFIPSCWwN3iIdrsadIE= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0= @@ -1400,18 +1400,18 @@ github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827 h github.com/smartcontractkit/chainlink-feeds v0.0.0-20240710170203-5b41615da827/go.mod h1:OPX+wC2TWQsyLNpR7daMt2vMpmsNcoBxbZyGTHr6tiA= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799 h1:HyLTySm7BR+oNfZqDTkVJ25wnmcTtxBBD31UkFL+kEM= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240709043547-03612098f799/go.mod h1:UVFRacRkP7O7TQAzFmR52v5mUlxf+G1ovMlCQAB/cHU= -github.com/smartcontractkit/chainlink-testing-framework v1.34.10 h1:7boGJr/wkX5TF6TBb4wRnP6t1IFL6RD98+fZBJBZyCY= -github.com/smartcontractkit/chainlink-testing-framework v1.34.10/go.mod h1:ekYJbRAxXcs/YgOjHsY9/tlvDvXzv3lxcZK2eFUZduc= +github.com/smartcontractkit/chainlink-testing-framework v1.35.0 h1:5FzS4YOwzjRe59VMM7MmEyjgJCq4/aXR1fzdEJEPiL8= +github.com/smartcontractkit/chainlink-testing-framework v1.35.0/go.mod h1:ekYJbRAxXcs/YgOjHsY9/tlvDvXzv3lxcZK2eFUZduc= github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.1 h1:1/r1wQZ4TOFpZ13w94r7amdF096Z96RuEnkOmrz1BGE= github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.1/go.mod h1:DC8sQMyTlI/44UCTL8QWFwb0bYNoXCfjwCv2hMivYZU= github.com/smartcontractkit/chainlink-testing-framework/seth v1.2.1 h1:GRAAvtn2+jhO/8Z3lig10eQXVcV4VuOI4UgCyoPdJBg= github.com/smartcontractkit/chainlink-testing-framework/seth v1.2.1/go.mod h1:afY3QmNgeR/VI1pRbGH8g3YXGy7C2RrFOwUzEFvL3L8= github.com/smartcontractkit/chainlink-testing-framework/wasp v0.4.10 h1:s7e9YPU/ECQ9xCyLc60ApFbf0blMjg9LWi31CAEjaZY= github.com/smartcontractkit/chainlink-testing-framework/wasp v0.4.10/go.mod h1:E7x2ICsT8vzy0nL6wwBphoQMoNwOMl0L9voQpEl1FoM= -github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240829192404-674eac31cc16 h1:cRpAbGogqGcjUcI1UMxRJ+NI0D2BYF4bCnJGp5I1+iA= -github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240829192404-674eac31cc16/go.mod h1:FP0vXPTAIyGFLVN3GU1zwp/eoi+nKZiTVG4Q97qEk0A= -github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240829192404-674eac31cc16 h1:xtxqhCCRIcOfsu/4Wd0qc2mIpSA7frbLUp1DXzVyAVE= -github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240829192404-674eac31cc16/go.mod h1:0hlkF9wKyi6Mcybla6kEcFvSRyBT0CmzxeH+AqCBxXo= +github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240902145730-2d77ff4623d0 h1:7Djr0n61hgCywndPLqOCq5QjPzSWC/b4TpuOC4mqXAA= +github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240902145730-2d77ff4623d0/go.mod h1:NjCfyvWFZE+z/enmDyLbKcPVW0ILJ61jTC8ce0lPmVI= +github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240902145730-2d77ff4623d0 h1:Ry0b3GaBLTcXre8RnZztOj1Q6vgTzp5APrdr9cZLCec= +github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20240902145730-2d77ff4623d0/go.mod h1:omJ9mZWX3VGD5is3iQSdmSVV1v02r6SnAZ3YND9ci2A= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0= github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7 h1:e38V5FYE7DA1JfKXeD5Buo/7lczALuVXlJ8YNTAUxcw= diff --git a/integration-tests/solclient/ocr2.go b/integration-tests/solclient/ocr2.go index 108cfe833..3fdbdd473 100644 --- a/integration-tests/solclient/ocr2.go +++ b/integration-tests/solclient/ocr2.go @@ -245,20 +245,20 @@ func (m *OCRv2) createProposal(version uint64) error { // Configure sets offchain config in multiple transactions func (m *OCRv2) Configure(cfg contracts.OffChainAggregatorV2Config) error { _, _, _, _, version, cfgBytes, err := confighelper.ContractSetConfigArgsForTests( - cfg.DeltaProgress, - cfg.DeltaResend, - cfg.DeltaRound, - cfg.DeltaGrace, - cfg.DeltaStage, + cfg.DeltaProgress.Duration(), + cfg.DeltaResend.Duration(), + cfg.DeltaRound.Duration(), + cfg.DeltaGrace.Duration(), + cfg.DeltaStage.Duration(), cfg.RMax, cfg.S, cfg.Oracles, cfg.ReportingPluginConfig, - cfg.MaxDurationQuery, - cfg.MaxDurationObservation, - cfg.MaxDurationReport, - cfg.MaxDurationShouldAcceptFinalizedReport, - cfg.MaxDurationShouldTransmitAcceptedReport, + cfg.MaxDurationQuery.Duration(), + cfg.MaxDurationObservation.Duration(), + cfg.MaxDurationReport.Duration(), + cfg.MaxDurationShouldAcceptFinalizedReport.Duration(), + cfg.MaxDurationShouldTransmitAcceptedReport.Duration(), cfg.F, cfg.OnchainConfig, ) diff --git a/integration-tests/testconfig/testconfig.go b/integration-tests/testconfig/testconfig.go index fcd79eb7a..a9a22ef4f 100644 --- a/integration-tests/testconfig/testconfig.go +++ b/integration-tests/testconfig/testconfig.go @@ -587,16 +587,10 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) { func (c *TestConfig) readNetworkConfiguration() error { // currently we need to read that kind of secrets only for network configuration - if c == nil { + if c.Network == nil { c.Network = &ctf_config.NetworkConfig{} } - c.Network.UpperCaseNetworkNames() - err := c.Network.Default() - if err != nil { - return fmt.Errorf("error reading default network config: %w", err) - } - return nil }