Merge branch 'develop' into TT-1049-Provide-e2e-coverage-reports-for-docker-tests

Author: lukaszcl

.changeset/brown-penguins-grin.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fix in memory data source cache changes/bug that only allowed pipeline results where none of the data sources failed. #bugfix

.changeset/four-shoes-trade.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Removed AppConfig from Evm config #internal

core/chains/evm/config/chain_scoped.go

@@ -4,29 +4,21 @@ import (
 	"math/big"
 	"time"
 
-	"go.uber.org/multierr"
-
-	ocr "github.com/smartcontractkit/libocr/offchainreporting"
-	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
-	"github.com/smartcontractkit/chainlink/v2/core/config"
 )
 
-func NewTOMLChainScopedConfig(appCfg config.AppConfig, tomlConfig *toml.EVMConfig, lggr logger.Logger) *ChainScoped {
+func NewTOMLChainScopedConfig(tomlConfig *toml.EVMConfig, lggr logger.Logger) *ChainScoped {
 	return &ChainScoped{
-		AppConfig: appCfg,
 		evmConfig: &EVMConfig{C: tomlConfig},
 		lggr:      lggr}
 }
 
 // ChainScoped implements config.ChainScopedConfig with a gencfg.BasicConfig and EVMConfig.
 type ChainScoped struct {
-	config.AppConfig
 	lggr logger.Logger
 
 	evmConfig *EVMConfig
@@ -44,24 +36,6 @@ func (c *ChainScoped) BlockEmissionIdleWarningThreshold() time.Duration {
 	return c.EVM().NodeNoNewHeadsThreshold()
 }
 
-func (c *ChainScoped) Validate() (err error) {
-	// Most per-chain validation is done on startup, but this combines globals as well.
-	lc := ocrtypes.LocalConfig{
-		BlockchainTimeout:                      c.OCR().BlockchainTimeout(),
-		ContractConfigConfirmations:            c.EVM().OCR().ContractConfirmations(),
-		ContractConfigTrackerPollInterval:      c.OCR().ContractPollInterval(),
-		ContractConfigTrackerSubscribeInterval: c.OCR().ContractSubscribeInterval(),
-		ContractTransmitterTransmitTimeout:     c.EVM().OCR().ContractTransmitterTransmitTimeout(),
-		DatabaseTimeout:                        c.EVM().OCR().DatabaseTimeout(),
-		DataSourceTimeout:                      c.OCR().ObservationTimeout(),
-		DataSourceGracePeriod:                  c.EVM().OCR().ObservationGracePeriod(),
-	}
-	if ocrerr := ocr.SanityCheckLocalConfig(lc); ocrerr != nil {
-		err = multierr.Append(err, ocrerr)
-	}
-	return
-}
-
 type EVMConfig struct {
 	C *toml.EVMConfig
 }

core/chains/evm/config/config.go

@@ -11,7 +11,6 @@ import (
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/config"
 )
 
 type EVM interface {
@@ -148,8 +147,5 @@ type NodePool interface {
 //
 //go:generate mockery --quiet --name ChainScopedConfig --output ./mocks/ --case=underscore
 type ChainScopedConfig interface {
-	config.AppConfig
-	Validate() error
-
 	EVM() EVM
 }