add unit test and remove in reverse order

smartcontractkit · Apr 22, 2024 · af3b5db · af3b5db
1 parent ff05527
commit af3b5db
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 25 deletions.
diff --git a/contracts/src/v0.8/automation/dev/test/AutomationRegistry2_3.t.sol b/contracts/src/v0.8/automation/dev/test/AutomationRegistry2_3.t.sol
@@ -521,7 +521,7 @@ contract SetConfig is SetUp {
       offchainConfigBytes
     );
 
-    (, IAutomationV21PlusCommon.OnchainConfigLegacy memory onchainConfig1, , ,) = registry.getState();
+    (, IAutomationV21PlusCommon.OnchainConfigLegacy memory onchainConfig1, , , ) = registry.getState();
     assertEq(onchainConfig1.registrars.length, 2);
 
     // BillingConfig2
@@ -546,23 +546,23 @@ contract SetConfig is SetUp {
 
     // new onchain config with 3 new registrars, all other fields stay the same as the default
     AutomationRegistryBase2_3.OnchainConfig memory cfg2 = AutomationRegistryBase2_3.OnchainConfig({
-        checkGasLimit: 5_000_000,
-        stalenessSeconds: 90_000,
-        gasCeilingMultiplier: 0,
-        maxPerformGas: 10_000_000,
-        maxCheckDataSize: 5_000,
-        maxPerformDataSize: 5_000,
-        maxRevertDataSize: 5_000,
-        fallbackGasPrice: 20_000_000_000,
-        fallbackLinkPrice: 2_000_000_000, // $20
-        fallbackNativePrice: 400_000_000_000, // $4,000
-        transcoder: 0xB1e66855FD67f6e85F0f0fA38cd6fBABdf00923c,
-        registrars: newRegistrars,
-        upkeepPrivilegeManager: PRIVILEGE_MANAGER,
-        chainModule: module,
-        reorgProtectionEnabled: true,
-        financeAdmin: FINANCE_ADMIN
-      });
+      checkGasLimit: 5_000_000,
+      stalenessSeconds: 90_000,
+      gasCeilingMultiplier: 0,
+      maxPerformGas: 10_000_000,
+      maxCheckDataSize: 5_000,
+      maxPerformDataSize: 5_000,
+      maxRevertDataSize: 5_000,
+      fallbackGasPrice: 20_000_000_000,
+      fallbackLinkPrice: 2_000_000_000, // $20
+      fallbackNativePrice: 400_000_000_000, // $4,000
+      transcoder: 0xB1e66855FD67f6e85F0f0fA38cd6fBABdf00923c,
+      registrars: newRegistrars,
+      upkeepPrivilegeManager: PRIVILEGE_MANAGER,
+      chainModule: module,
+      reorgProtectionEnabled: true,
+      financeAdmin: FINANCE_ADMIN
+    });
 
     // the second time uses the new onchain config with 3 new registrars and also new billing tokens/configs
     bytes memory onchainConfigBytesWithBilling2 = abi.encode(cfg2, billingTokens2, billingConfigs2);
@@ -577,9 +577,18 @@ contract SetConfig is SetUp {
       offchainConfigBytes
     );
 
-    (, IAutomationV21PlusCommon.OnchainConfigLegacy memory onchainConfig2, address[] memory signers, address[] memory transmitters, uint8 f) = registry.getState();
+    (
+      ,
+      IAutomationV21PlusCommon.OnchainConfigLegacy memory onchainConfig2,
+      address[] memory signers,
+      address[] memory transmitters,
+      uint8 f
+    ) = registry.getState();
 
     assertEq(onchainConfig2.registrars.length, 3);
+    for (uint256 i = 0; i < newRegistrars.length; i++) {
+      assertEq(newRegistrars[i], onchainConfig2.registrars[i]);
+    }
     assertEq(signers, SIGNERS);
     assertEq(transmitters, TRANSMITTERS);
     assertEq(f, F);

diff --git a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistry2_3.sol b/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistry2_3.sol
@@ -355,8 +355,8 @@ contract AutomationRegistry2_3 is AutomationRegistryBase2_3, OCR2Abstract, Chain
       offchainConfig
     );
 
-    for (uint256 idx = 0; idx < s_registrars.length(); idx++) {
-      s_registrars.remove(s_registrars.at(idx));
+    for (uint256 idx = s_registrars.length(); idx > 0; idx--) {
+      s_registrars.remove(s_registrars.at(idx - 1));
     }
 
     for (uint256 idx = 0; idx < onchainConfig.registrars.length; idx++) {

diff --git a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicC2_3.sol b/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicC2_3.sol
@@ -185,8 +185,8 @@ contract AutomationRegistryLogicC2_3 is AutomationRegistryBase2_3 {
       s_transmitters[deactivatedAddr].balance = 0;
     }
 
-    for (uint256 idx = 0; idx < s_deactivatedTransmitters.length(); idx++) {
-      s_deactivatedTransmitters.remove(s_deactivatedTransmitters.at(idx));
+    for (uint256 idx = s_deactivatedTransmitters.length(); idx > 0; idx--) {
+      s_deactivatedTransmitters.remove(s_deactivatedTransmitters.at(idx - 1));
     }
 
     emit NOPsSettledOffchain(payees, payments);