Add modifier and tests for removeAuthorizedAddressAtIndex

2 files changed, 10 insertions, 2 deletions

diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinAuthorizable.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinAuthorizable.sol
index 8cb4254c5..37c12f861 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinAuthorizable.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/MixinAuthorizable.sol
@@ -69,7 +69,7 @@ contract MixinAuthorizable is
         );
 
         delete authorized[target];
-        for (uint i = 0; i < authorities.length; i++) {
+        for (uint256 i = 0; i < authorities.length; i++) {
             if (authorities[i] == target) {
                 authorities[i] = authorities[authorities.length - 1];
                 authorities.length -= 1;
@@ -87,8 +87,13 @@ contract MixinAuthorizable is
         uint256 index
     )
         external
+        onlyOwner
     {
         require(
+            authorized[target],
+            TARGET_NOT_AUTHORIZED
+        );
+        require(
             index < authorities.length,
             INDEX_OUT_OF_BOUNDS
         );
diff --git a/packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol b/packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol
index 296c6c856..99b93d0d2 100644
--- a/packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol
+++ b/packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol
@@ -13,6 +13,9 @@ import "./IOwnable.sol";
 contract Ownable is IOwnable {
     address public owner;
 
+    // Revert reasons
+    string constant ONLY_CONTRACT_OWNER = "ONLY_CONTRACT_OWNER";
+
     constructor ()
         public
     {
@@ -22,7 +25,7 @@ contract Ownable is IOwnable {
     modifier onlyOwner() {
         require(
             msg.sender == owner,
-            "Only contract owner is allowed to call this method."
+            ONLY_CONTRACT_OWNER
         );
         _;
     }