fix: rm length checks, reorder functions and change visibility (#272)

Author: Lucas Manuel

src/InvariantTest.sol

@@ -17,78 +17,76 @@ contract InvariantTest {
     string[] private _excludedArtifacts;
     string[] private _targetedArtifacts;
 
-    FuzzSelector[] internal _targetedArtifactSelectors;
-    FuzzSelector[] internal _targetedSelectors;
+    FuzzSelector[] private _targetedArtifactSelectors;
+    FuzzSelector[] private _targetedSelectors;
+
+    // Functions for users:
+    // These are intended to be called in tests.
+
+    function excludeContract(address newExcludedContract_) internal {
+        _excludedContracts.push(newExcludedContract_);
+    }
+
+    function excludeSender(address newExcludedSender_) internal {
+        _excludedSenders.push(newExcludedSender_);
+    }
+
+    function targetArtifact(string memory newTargetedArtifact_) internal {
+        _targetedArtifacts.push(newTargetedArtifact_);
+    }
+
+    function targetArtifactSelector(FuzzSelector memory newTargetedArtifactSelector_) internal {
+        _targetedArtifactSelectors.push(newTargetedArtifactSelector_);
+    }
+
+    function targetContract(address newTargetedContract_) internal {
+        _targetedContracts.push(newTargetedContract_);
+    }
+
+    function targetSelector(FuzzSelector memory newTargetedSelector_) internal {
+        _targetedSelectors.push(newTargetedSelector_);
+    }
+
+    function targetSender(address newTargetedSender_) internal {
+        _targetedSenders.push(newTargetedSender_);
+    }
+
+    // Functions for forge:
+    // These are called by forge to run invariant tests and don't need to be called in tests.
 
     function excludeArtifact(string memory newExcludedArtifact_) internal {
         _excludedArtifacts.push(newExcludedArtifact_);
     }
 
     function excludeArtifacts() public view returns (string[] memory excludedArtifacts_) {
-        require(_excludedArtifacts.length != uint256(0), "NO_EXCLUDED_ARTIFACTS");
         excludedArtifacts_ = _excludedArtifacts;
     }
 
-    function excludeContract(address newExcludedContract_) internal {
-        _excludedContracts.push(newExcludedContract_);
-    }
-
     function excludeContracts() public view returns (address[] memory excludedContracts_) {
-        require(_excludedContracts.length != uint256(0), "NO_EXCLUDED_CONTRACTS");
         excludedContracts_ = _excludedContracts;
     }
 
-    function excludeSender(address newExcludedSender_) internal {
-        _excludedSenders.push(newExcludedSender_);
-    }
-
     function excludeSenders() public view returns (address[] memory excludedSenders_) {
-        require(_excludedSenders.length != uint256(0), "NO_EXCLUDED_SENDERS");
         excludedSenders_ = _excludedSenders;
     }
 
-    function targetArtifact(string memory newTargetedArtifact_) internal {
-        _targetedArtifacts.push(newTargetedArtifact_);
-    }
-
     function targetArtifacts() public view returns (string[] memory targetedArtifacts_) {
-        require(_targetedArtifacts.length != uint256(0), "NO_TARGETED_ARTIFACTS");
         targetedArtifacts_ = _targetedArtifacts;
     }
 
-    function targetArtifactSelector(FuzzSelector memory newTargetedArtifactSelector_) internal {
-        _targetedArtifactSelectors.push(newTargetedArtifactSelector_);
-    }
-
     function targetArtifactSelectors() public view returns (FuzzSelector[] memory targetedArtifactSelectors_) {
-        require(targetedArtifactSelectors_.length != uint256(0), "NO_TARGETED_ARTIFACT_SELECTORS");
         targetedArtifactSelectors_ = _targetedArtifactSelectors;
     }
 
-    function targetContract(address newTargetedContract_) internal {
-        _targetedContracts.push(newTargetedContract_);
-    }
-
     function targetContracts() public view returns (address[] memory targetedContracts_) {
-        require(_targetedContracts.length != uint256(0), "NO_TARGETED_CONTRACTS");
         targetedContracts_ = _targetedContracts;
     }
 
-    function targetSelector(FuzzSelector memory newTargetedSelector_) internal {
-        _targetedSelectors.push(newTargetedSelector_);
-    }
-
     function targetSelectors() public view returns (FuzzSelector[] memory targetedSelectors_) {
-        require(targetedSelectors_.length != uint256(0), "NO_TARGETED_SELECTORS");
         targetedSelectors_ = _targetedSelectors;
     }
 
-    function targetSender(address newTargetedSender_) internal {
-        _targetedSenders.push(newTargetedSender_);
-    }
-
     function targetSenders() public view returns (address[] memory targetedSenders_) {
-        require(_targetedSenders.length != uint256(0), "NO_TARGETED_SENDERS");
         targetedSenders_ = _targetedSenders;
     }
 }