update

smartcontractkit · Feb 19, 2024 · fcb5b30 · fcb5b30
1 parent da8cd67
commit fcb5b30
Show file tree

Hide file tree

Showing 3 changed files with 183 additions and 184 deletions.
diff --git a/integration-tests/contracts/ethereum_keeper_contracts.go b/integration-tests/contracts/ethereum_keeper_contracts.go
@@ -445,23 +445,27 @@ func (v *EthereumKeeperRegistry) SetConfig(config KeeperRegistrySettings, ocrCon
 		}
 		return v.client.ProcessTransaction(tx)
 	case ethereum.RegistryVersion_2_2:
-		tx, err := v.registry2_2.SetConfig(txOpts,
-			ocrConfig.Signers,
-			ocrConfig.Transmitters,
-			ocrConfig.F,
-			ocrConfig.OnchainConfig,
-			ocrConfig.OffchainConfigVersion,
-			ocrConfig.OffchainConfig,
-		)
-		if err != nil {
-			return err
-		}
-		return v.client.ProcessTransaction(tx)
+		return v.setConfig22(txOpts, ocrConfig)
 	}
 
 	return fmt.Errorf("keeper registry version %d is not supported", v.version)
 }
 
+func (v *EthereumKeeperRegistry) setConfig22(txOpts *bind.TransactOpts, ocrConfig OCRv2Config) error {
+	tx, err := v.registry2_2.SetConfig(txOpts,
+		ocrConfig.Signers,
+		ocrConfig.Transmitters,
+		ocrConfig.F,
+		ocrConfig.OnchainConfig,
+		ocrConfig.OffchainConfigVersion,
+		ocrConfig.OffchainConfig,
+	)
+	if err != nil {
+		return err
+	}
+	return v.client.ProcessTransaction(tx)
+}
+
 // Pause pauses the registry.
 func (v *EthereumKeeperRegistry) Pause() error {
 	txOpts, err := v.client.TransactionOpts(v.client.GetDefaultWallet())

diff --git a/integration-tests/reorg/automation_reorg_test.go b/integration-tests/reorg/automation_reorg_test.go
@@ -130,13 +130,13 @@ func TestAutomationReorg(t *testing.T) {
 
 	registryVersions := map[string]ethereum.KeeperRegistryVersion{
 		"registry_2_0": ethereum.RegistryVersion_2_0,
-		// "registry_2_1_conditional": ethereum.RegistryVersion_2_1,
-		// "registry_2_1_logtrigger":  ethereum.RegistryVersion_2_1,
+		"registry_2_1_conditional": ethereum.RegistryVersion_2_1,
+		"registry_2_1_logtrigger":  ethereum.RegistryVersion_2_1,
+		"registry_2_2_conditional":  ethereum.RegistryVersion_2_2,
+		"registry_2_2_logtrigger":  ethereum.RegistryVersion_2_2,
 	}
 
 	for name, registryVersion := range registryVersions {
-		name := name
-		registryVersion := registryVersion
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			config, err := tc.GetConfig("Reorg", tc.Automation)