Switch to permission standard.

kleros · Feb 21, 2018 · b204a42 · b204a42
1 parent d19ef93
commit b204a42
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/...s/standard/whitelist/AddressBlacklist.sol → .../standard/permission/AddressBlacklist.sol b/...s/standard/whitelist/AddressBlacklist.sol → .../standard/permission/AddressBlacklist.sol
@@ -19,7 +19,7 @@ contract AddressBlacklist is AddressWhitelist {
      *  @param _value The address we want to know if allowed.
      *  @return allowed True if the address is allowed, false otherwize.
      */
-    function isAllowed(address _value) public returns (bool allowed) {
-        return !super.isAllowed(_value);
+    function isPermitted(address _value) public returns (bool allowed) {
+        return !super.isPermitted(_value);
     }
 }
diff --git a/...s/standard/whitelist/AddressWhitelist.sol → .../standard/permission/AddressWhitelist.sol b/...s/standard/whitelist/AddressWhitelist.sol → .../standard/permission/AddressWhitelist.sol
@@ -28,7 +28,7 @@ contract AddressWhitelist is Ownable, AddressWhitelistInterface {
      *  @param _value The address we want to know if allowed.
      *  @return allowed True if the address is allowed, false otherwize.
      */
-    function isAllowed(address _value) public returns (bool allowed) {
+    function isPermitted(address _value) public returns (bool allowed) {
         return registred[_value];
     }
 }
diff --git a/...d/whitelist/AddressWhitelistInterface.sol → .../permission/AddressWhitelistInterface.sol b/...d/whitelist/AddressWhitelistInterface.sol → .../permission/AddressWhitelistInterface.sol
@@ -14,5 +14,5 @@ interface AddressWhitelistInterface{
      *  @param _value The address we want to know if allowed.
      *  @return allowed True if the address is allowed, false otherwize.
      */
-    function isAllowed(address _value) public returns (bool allowed);
+    function isPermitted(address _value) public returns (bool allowed);
 }
diff --git a/contracts/standard/whitelist/Blacklist.sol → contracts/standard/permission/Blacklist.sol b/contracts/standard/whitelist/Blacklist.sol → contracts/standard/permission/Blacklist.sol
@@ -18,7 +18,7 @@ contract Blacklist is Whitelist {
      *  @param _value The address we want to know if allowed.
      *  @return allowed True if the address is allowed, false otherwize.
      */
-    function isAllowed(bytes32 _value) public returns (bool allowed) {
-        return !super.isAllowed(_value);
+    function isPermitted(bytes32 _value) public returns (bool allowed) {
+        return !super.isPermitted(_value);
     }
 }
diff --git a/contracts/standard/whitelist/Whitelist.sol → contracts/standard/permission/Whitelist.sol b/contracts/standard/whitelist/Whitelist.sol → contracts/standard/permission/Whitelist.sol
@@ -28,7 +28,7 @@ contract Whitelist is Ownable, WhitelistInterface {
      *  @param _value The value we want to know if allowed.
      *  @return allowed True if the value is allowed, false otherwize.
      */
-    function isAllowed(bytes32 _value) public returns (bool allowed) {
+    function isPermitted(bytes32 _value) public returns (bool allowed) {
         return registred[_value];
     }
 }
diff --git a/...standard/whitelist/WhitelistInterface.sol → ...tandard/permission/WhitelistInterface.sol b/...standard/whitelist/WhitelistInterface.sol → ...tandard/permission/WhitelistInterface.sol
@@ -14,5 +14,5 @@ interface WhitelistInterface{
      *  @param _value The value we want to know if allowed.
      *  @return allowed True if the value is allowed, false otherwize.
      */
-    function isAllowed(bytes32 _value) public returns (bool allowed);
+    function isPermitted(bytes32 _value) public returns (bool allowed);
 }