fix: removeOperator logic fix

MassDotMoney · Dec 22, 2021 · a2cbe60 · a2cbe60
1 parent 809fdfd
commit a2cbe60
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/contracts/NestedFactory.sol b/contracts/NestedFactory.sol
@@ -92,13 +92,16 @@ contract NestedFactory is INestedFactory, ReentrancyGuard, Ownable, MixinOperato
 
     /// @inheritdoc INestedFactory
     function removeOperator(bytes32 operator) external override onlyOwner {
-        uint256 i = 0;
-        while (operators[i] != operator) {
-            i++;
+        uint256 operatorsLength = operators.length;
+        for (uint256 i = 0; i < operatorsLength; i++) {
+	        if (operators[i] == operator) {
+                operators[i] = operators[operatorsLength - 1];
+		        operators.pop();
+                emit OperatorRemoved(operator);
+                return;
+	        }
         }
-        require(i != 0, "NF: NON_EXISTENT_OPERATOR");
-        delete operators[i];
-        emit OperatorRemoved(operator);
+        revert("NF: NON_EXISTENT_OPERATOR");
     }
 
     /// @inheritdoc INestedFactory

diff --git a/test/unit/NestedFactory.unit.ts b/test/unit/NestedFactory.unit.ts
@@ -135,7 +135,7 @@ describe("NestedFactory", () => {
             const operators = await context.nestedFactory.resolverAddressesRequired();
 
             // Must have 2 operators ("ZeroEx" from Fixture and "test")
-            expect(operators.length).to.be.equal(3);
+            expect(operators.length).to.be.equal(2);
             expect(operators[0]).to.be.equal(context.zeroExOperatorNameBytes32);
             expect(operators[1]).to.be.equal(context.flatOperatorNameBytes32);
             expect(operators[2]).to.not.be.equal(toBytes32("test"));