crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less confusion. Also updated the function description.

Browse Source
This commit is contained in:
Greg Hysen
2018-04-17 17:00:55 -07:00
committed by Amir Bandeali
parent ac0c35424b
commit ab13ce96cc
6 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/AssetProxyDispatcher.sol
View File

@@ -24,9 +24,9 @@ import "../../utils/Ownable/Ownable.sol";
import "../../utils/Authorizable/Authorizable.sol";
contract AssetProxyDispatcher is
IAssetProxyDispatcher,
Ownable,
Authorizable
Authorizable,
IAssetProxyDispatcher
{
// Mapping from Asset Proxy Id's to their respective Asset Proxy
mapping (uint8 => IAssetProxy) public assetProxies;
@@ -53,11 +53,13 @@ contract AssetProxyDispatcher is
assetProxy.transferFrom(assetMetadata, from, to, amount);
}
/// @dev Adds a new asset proxy.
/// @param assetProxyId Id of the asset proxy.
/// @param newAssetProxy Asset proxy contract to add, or 0x0 to unset assetProxyId.
/// @dev Registers an asset proxy to an asset proxy id.
/// An id can only be assigned to a single proxy at a given time,
/// however, an asset proxy may be registered to multiple ids.
/// @param assetProxyId Id to register`newAssetProxy` under.
/// @param newAssetProxy asset proxy to register, or 0x0 to unset assetProxyId.
/// @param currentAssetProxy Existing asset proxy to overwrite, or 0x0 if assetProxyId is currently unused.
function addAssetProxy(
function registerAssetProxy(
uint8 assetProxyId,
IAssetProxy newAssetProxy,
IAssetProxy currentAssetProxy)

2
packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxy.sol
View File

@@ -18,7 +18,7 @@
pragma solidity ^0.4.21;
import "../../../utils/Authorizable/IAuthorizable.sol";
import "../../utils/Authorizable/IAuthorizable.sol";
contract IAssetProxy is IAuthorizable {

10
packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxyDispatcher.sol
View File

@@ -35,11 +35,13 @@ contract IAssetProxyDispatcher is
IAssetProxy oldAssetClassAddress
);
/// @dev Adds a new asset proxy.
/// @param assetProxyId Id of the asset proxy.
/// @param newAssetProxy Asset proxy contract to add, or 0x0 to unset assetProxyId.
/// @dev Registers an asset proxy to an asset proxy id.
/// An id can only be assigned to a single proxy at a given time,
/// however, an asset proxy may be registered to multiple ids.
/// @param assetProxyId Id to register`newAssetProxy` under.
/// @param newAssetProxy asset proxy to register, or 0x0 to unset assetProxyId.
/// @param currentAssetProxy Existing asset proxy to overwrite, or 0x0 if assetProxyId is currently unused.
function addAssetProxy(
function registerAssetProxy(
uint8 assetProxyId,
IAssetProxy newAssetProxy,
IAssetProxy currentAssetProxy)