deem ineligible if in bad standing

Hats-Protocol · Sep 10, 2024 · af2113f · af2113f
1 parent 91d8ca5
commit af2113f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/HatControlledModule.sol b/src/HatControlledModule.sol
@@ -114,7 +114,12 @@ contract HatControlledModule is HatsEligibilityModule, HatsToggleModule {
   /// @inheritdoc HatsEligibilityModule
   function getWearerStatus(address _wearer, uint256 _hatId) public view override returns (bool eligible, bool standing) {
     IneligibilityData memory data = wearerIneligibility[_hatId][_wearer];
-    return (!data.ineligible, !data.badStanding);
+    // bad standing means not eligible, as well
+    if (data.badStanding) return (false, false);
+    // good standing but ineligible
+    if (data.ineligible) return (false, true);
+    // eligible and in good standing
+    return (true, true);
   }
 
   /*//////////////////////////////////////////////////////////////

diff --git a/test/HatControlledModule.t.sol b/test/HatControlledModule.t.sol
@@ -62,6 +62,13 @@ contract WithInstanceTest is HatControlledModuleTest {
     );
   }
 
+  function assertWearerStatus(address _wearer, uint256 _hatId, bool _eligible, bool _standing) public view {
+    (bool eligible, bool standing) = instance.getWearerStatus(_wearer, _hatId);
+    assertEq(standing, _standing);
+    if (_standing) assertEq(eligible, _eligible);
+    else assertFalse(eligible);
+  }
+
   modifier caller_(address _caller) {
     caller = _caller;
     vm.prank(caller);
@@ -104,35 +111,27 @@ contract Eligibility is WithInstanceTest {
     vm.prank(controller);
     instance.setWearerStatus(_wearer, _hatId, _eligible, _standing);
 
-    (bool eligible, bool standing) = instance.getWearerStatus(_wearer, _hatId);
-    assertEq(eligible, _eligible);
-    assertEq(standing, _standing);
+    assertWearerStatus(_wearer, _hatId, _eligible, _standing);
 
     // set the same wearer's status for a different hat
     uint256 differentHat = uint256(keccak256(abi.encodePacked(_hatId)));
 
     vm.prank(controller);
     instance.setWearerStatus(_wearer, differentHat, _eligible, _standing);
 
-    (eligible, standing) = instance.getWearerStatus(_wearer, differentHat);
-    assertEq(eligible, _eligible);
-    assertEq(standing, _standing);
+    assertWearerStatus(_wearer, differentHat, _eligible, _standing);
 
     // set a different wearer's status for the first hat
     address otherWearer = address(bytes20(keccak256(abi.encodePacked(_wearer))));
 
     vm.prank(controller);
     instance.setWearerStatus(otherWearer, _hatId, _eligible, _standing);
 
-    (eligible, standing) = instance.getWearerStatus(otherWearer, _hatId);
-    assertEq(eligible, _eligible);
-    assertEq(standing, _standing);
+    assertWearerStatus(otherWearer, _hatId, _eligible, _standing);
   }
 
   function test_default() public view {
-    (bool eligible, bool standing) = instance.getWearerStatus(wearer, targetHat);
-    assertTrue(eligible);
-    assertTrue(standing);
+    assertWearerStatus(wearer, targetHat, true, true);
   }
 
   function test_revert_nonController_cannotSetWearerStatus() public {