Setting CCIP feature flag to true - it's no longer used anywhere

smartcontractkit · Aug 2, 2024 · e9bcab8 · e9bcab8
1 parent 01a5830
commit e9bcab8
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 21 deletions.
diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml
@@ -14,7 +14,7 @@ LogPoller = false # Default
 # UICSAKeys enables CSA Keys in the UI.
 UICSAKeys = false # Default
 # CCIP enables the CCIP service.
-CCIP = false # Default
+CCIP = true # Default
 
 [Database]
 # DefaultIdleInTxSessionTimeout is the maximum time allowed for a transaction to be open and idle before timing out. See Postgres `idle_in_transaction_session_timeout` for more details.

diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go
@@ -261,7 +261,7 @@ func TestConfig_Marshal(t *testing.T) {
 		FeedsManager: ptr(true),
 		LogPoller:    ptr(true),
 		UICSAKeys:    ptr(true),
-		CCIP:         ptr(false),
+		CCIP:         ptr(true),
 	}
 	full.Database = toml.Database{
 		DefaultIdleInTxSessionTimeout: commoncfg.MustNewDuration(time.Minute),
@@ -772,7 +772,7 @@ Headers = ['Authorization: token', 'X-SomeOther-Header: value with spaces | and
 FeedsManager = true
 LogPoller = true
 UICSAKeys = true
-CCIP = false
+CCIP = true
 `},
 		{"Database", Config{Core: toml.Core{Database: full.Database}}, `[Database]
 DefaultIdleInTxSessionTimeout = '1m0s'

diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml
@@ -6,7 +6,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml
@@ -6,7 +6,7 @@ ShutdownGracePeriod = '10s'
 FeedsManager = true
 LogPoller = true
 UICSAKeys = true
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1m0s'

diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml
@@ -6,7 +6,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go b/core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go
@@ -379,7 +379,6 @@ func setupNodeCCIP(
 			fmt.Sprintf("127.0.0.1:%d", port),
 		}
 		c.Log.Level = &loglevel
-		c.Feature.CCIP = &trueRef
 		c.Feature.UICSAKeys = &trueRef
 		c.Feature.FeedsManager = &trueRef
 		c.OCR.Enabled = &falseRef

diff --git a/core/services/ocr2/plugins/ccip/testhelpers/testhelpers_1_4_0/chainlink.go b/core/services/ocr2/plugins/ccip/testhelpers/testhelpers_1_4_0/chainlink.go
@@ -379,7 +379,6 @@ func setupNodeCCIP(
 			fmt.Sprintf("127.0.0.1:%d", port),
 		}
 		c.Log.Level = &loglevel
-		c.Feature.CCIP = &trueRef
 		c.Feature.UICSAKeys = &trueRef
 		c.Feature.FeedsManager = &trueRef
 		c.OCR.Enabled = &falseRef

diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml
@@ -6,7 +6,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml
@@ -6,7 +6,7 @@ ShutdownGracePeriod = '10s'
 FeedsManager = true
 LogPoller = true
 UICSAKeys = true
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1m0s'

diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml
@@ -6,7 +6,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/docs/CONFIG.md b/docs/CONFIG.md
@@ -51,7 +51,7 @@ ShutdownGracePeriod is the maximum time allowed to shut down gracefully. If exce
 FeedsManager = true # Default
 LogPoller = false # Default
 UICSAKeys = false # Default
-CCIP = false # Default
+CCIP = true # Default
 ```
 
 
@@ -75,7 +75,7 @@ UICSAKeys enables CSA Keys in the UI.
 
 ### CCIP
 ```toml
-CCIP = false # Default
+CCIP = true # Default
 ```
 CCIP enables the CCIP service.
 

diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar
@@ -18,7 +18,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -62,7 +62,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -62,7 +62,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar
@@ -62,7 +62,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar
@@ -47,7 +47,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar
@@ -52,7 +52,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
@@ -59,7 +59,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar
@@ -41,7 +41,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
-CCIP = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'