Revert "[fix] Remove SetDefaults() call which deletes enabled (smartcontractkit#16440)" (smartcontractkit#16741)

jmank88 · web-flow · commit 1ba57149b609 · 2025-03-12T23:47:26.000Z
This reverts commit d923d5a.
diff --git a/core/services/chainlink/config.go b/core/services/chainlink/config.go
@@ -261,6 +261,10 @@ func (c RawConfig) NodeNames() []string {
 }
 
 func (c RawConfig) SetDefaults() {
+	if e, ok := c["Enabled"].(bool); ok && e {
+		// already enabled by default so drop it
+		delete(c, "Enabled")
+	}
 }
 
 // TOMLString returns a TOML encoded string.
diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go
@@ -1813,7 +1813,6 @@ func TestRawConfig_IsEnabled(t *testing.T) {
 }
 
 func TestRawConfig_SetDefaults(t *testing.T) {
-	t.Skip()
 	c := RawConfig{"Enabled": true}
 	c.SetDefaults()
 	require.NotContains(t, c, "Enabled")

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,10 @@ func (c RawConfig) NodeNames() []string {`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`func (c RawConfig) SetDefaults() {`
	`264`	`+ if e, ok := c["Enabled"].(bool); ok && e {`
	`265`	`+ // already enabled by default so drop it`
	`266`	`+ delete(c, "Enabled")`
	`267`	`+ }`
`264`	`268`	`}`
`265`	`269`
`266`	`270`	`// TOMLString returns a TOML encoded string.`
Original file line number	Diff line number	Diff line change
`@@ -1813,7 +1813,6 @@ func TestRawConfig_IsEnabled(t *testing.T) {`
`1813`	`1813`	`}`
`1814`	`1814`
`1815`	`1815`	`func TestRawConfig_SetDefaults(t *testing.T) {`
`1816`		`- t.Skip()`
`1817`	`1816`	`c := RawConfig{"Enabled": true}`
`1818`	`1817`	`c.SetDefaults()`
`1819`	`1818`	`require.NotContains(t, c, "Enabled")`