Get Examples compiling

Hats-Protocol · Jun 28, 2022 · 4aa2f76 · 4aa2f76
1 parent a1c1dfb
commit 4aa2f76
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/src/HatsConditions/SampleHatsConditions.sol b/src/HatsConditions/SampleHatsConditions.sol
@@ -3,6 +3,7 @@
 pragma solidity >=0.8.13;
 
 import "./IHatsConditions.sol";
+import "../IHats.sol";
 import "solmate/auth/Auth.sol";
 
 abstract contract ExpiringHatsConditions is IHatsConditions {
@@ -18,11 +19,11 @@ abstract contract ExpiringHatsConditions is IHatsConditions {
         virtual
         returns (bool)
     {
-        return (now < expiries[_hatId]);
+        return (block.timestamp < expiries[_hatId]);
     }
 
     function setExpiry(uint256 _hatId, uint256 _expiry) public virtual {
-        if (now > _expiry) {
+        if (block.timestamp > _expiry) {
             revert ExpiryInPast();
         }
 
@@ -32,7 +33,7 @@ abstract contract ExpiringHatsConditions is IHatsConditions {
     }
 }
 
-abstract contract OwnableHatsConditions is IHats, IHatsConditions, Auth {
+abstract contract OwnableHatsConditions is IHatsConditions, Auth {
     event HatStatusSet(uint256 _hatId, bool _status);
 
     IHats public HATS;
@@ -63,7 +64,7 @@ abstract contract OwnableHatsConditions is IHats, IHatsConditions, Auth {
         emit HatStatusSet(_hatId, _status);
     }
 
-    function _updateHatStatus(_uint256 _hatId, bool _status) internal virtual {
+    function _updateHatStatus(uint256 _hatId, bool _status) internal virtual {
         HATS.changeHatStatus(_hatId, _status);
     }
 }
diff --git a/src/HatsOracles/SampleHatsOracle.sol b/src/HatsOracles/SampleHatsOracle.sol
@@ -3,6 +3,7 @@
 pragma solidity >=0.8.13;
 
 import "./IHatsOracle.sol";
+import "../IHats.sol";
 import "solmate/auth/Auth.sol";
 
 abstract contract ExpiringHatsOracle is IHatsOracle {
@@ -17,27 +18,27 @@ abstract contract ExpiringHatsOracle is IHatsOracle {
     }
 
     // key1: wearer => key2: hatId => value: token expiry timestamp
-    mapping(address => mapping(uint256 => uint256)) public tokenExpiries; 
+    mapping(address => mapping(uint256 => uint256)) public tokenExpiries;
 
     function ruleOnWearerStanding(address _wearer, uint64 _hatId)
         external
         virtual
     {
         bool ruling = checkWearerStanding(_wearer, _hatId);
-     
+
         HATS.ruleOnHatWearerStanding(_hatId, _wearer, ruling);
     }
 
     function checkWearerStanding(address _wearer, uint64 _hatId)
-        external
+        public
         view
-        returns (bool);
+        returns (bool)
     {
-        return (now < tokenExpiries[_wearer][_hatId]);
+        return (block.timestamp < tokenExpiries[_wearer][_hatId]);
     }
 
     function setTokenExpiry(address _wearer, uint256 _hatId, uint256 _expiry) public virtual {
-        if (now > _expiry) {
+        if (block.timestamp > _expiry) {
             revert TokenExpiryInPast();
         }
 
@@ -59,17 +60,17 @@ abstract contract OwnableHatsOracle is IHats, IHatsOracle, Auth {
     }
 
     // do we want to standardize this function / add to the interface?
-    function _ruleOnWearerStanding(address _wearer, uint64 _hatId, bool _ruling)
+    function _ruleOnWearerStanding(address _wearer, uint256 _hatId, bool _ruling)
         internal
         virtual
-    {        
+    {
         HATS.ruleOnHatWearerStanding(_hatId, _wearer, _ruling);
     }
 
     function checkWearerStanding(address _wearer, uint64 _hatId)
-        external
+        public
         view
-        returns (bool);
+        returns (bool)
     {
         return standing[_wearer][_hatId];
     }
@@ -84,4 +85,4 @@ abstract contract OwnableHatsOracle is IHats, IHatsOracle, Auth {
 
         emit HatStandingSet(_wearer, _hatId, _standing);
     }
-}
+}