From 201dc7c28d998339b7f51ec5c55c2447e696f70c Mon Sep 17 00:00:00 2001 From: James Towle Date: Fri, 7 Jun 2019 17:06:34 -0700 Subject: [PATCH] Removed events from the Mixins in asset-proxy --- .../contracts/src/MixinAssetProxyDispatcher.sol | 6 ------ .../asset-proxy/contracts/src/MixinAuthorizable.sol | 12 ------------ .../src/interfaces/IAssetProxyDispatcher.sol | 6 ++++++ .../contracts/src/interfaces/IAuthorizable.sol | 12 ++++++++++++ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contracts/asset-proxy/contracts/src/MixinAssetProxyDispatcher.sol b/contracts/asset-proxy/contracts/src/MixinAssetProxyDispatcher.sol index 1396542c27..804b0a8686 100644 --- a/contracts/asset-proxy/contracts/src/MixinAssetProxyDispatcher.sol +++ b/contracts/asset-proxy/contracts/src/MixinAssetProxyDispatcher.sol @@ -27,12 +27,6 @@ contract MixinAssetProxyDispatcher is Ownable, IAssetProxyDispatcher { - // Logs registration of new asset proxy - event AssetProxyRegistered( - bytes4 id, // Id of new registered AssetProxy. - address assetProxy // Address of new registered AssetProxy. - ); - // Mapping from Asset Proxy Id's to their respective Asset Proxy mapping (bytes4 => address) public assetProxies; diff --git a/contracts/asset-proxy/contracts/src/MixinAuthorizable.sol b/contracts/asset-proxy/contracts/src/MixinAuthorizable.sol index 6038c18a70..8fa2154521 100644 --- a/contracts/asset-proxy/contracts/src/MixinAuthorizable.sol +++ b/contracts/asset-proxy/contracts/src/MixinAuthorizable.sol @@ -26,18 +26,6 @@ contract MixinAuthorizable is Ownable, IAuthorizable { - // Event logged when a new address is authorized. - event AuthorizedAddressAdded( - address indexed target, - address indexed caller - ); - - // Event logged when a currently authorized address is unauthorized. - event AuthorizedAddressRemoved( - address indexed target, - address indexed caller - ); - /// @dev Only authorized addresses can invoke functions with this modifier. modifier onlyAuthorized { require( diff --git a/contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol b/contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol index b1d68328c1..93d97d006d 100644 --- a/contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol +++ b/contracts/asset-proxy/contracts/src/interfaces/IAssetProxyDispatcher.sol @@ -21,6 +21,12 @@ pragma solidity ^0.5.9; contract IAssetProxyDispatcher { + // Logs registration of new asset proxy + event AssetProxyRegistered( + bytes4 id, // Id of new registered AssetProxy. + address assetProxy // Address of new registered AssetProxy. + ); + /// @dev Registers an asset proxy to its asset proxy id. /// Once an asset proxy is registered, it cannot be unregistered. /// @param assetProxy Address of new asset proxy to register. diff --git a/contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol b/contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol index 43d2f98690..517e5d69bf 100644 --- a/contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol +++ b/contracts/asset-proxy/contracts/src/interfaces/IAuthorizable.sol @@ -24,6 +24,18 @@ import "@0x/contracts-utils/contracts/src/interfaces/IOwnable.sol"; contract IAuthorizable is IOwnable { + // Event logged when a new address is authorized. + event AuthorizedAddressAdded( + address indexed target, + address indexed caller + ); + + // Event logged when a currently authorized address is unauthorized. + event AuthorizedAddressRemoved( + address indexed target, + address indexed caller + ); + /// @dev Authorizes an address. /// @param target Address to authorize. function addAuthorizedAddress(address target)