diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-06-05 10:40:01 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2018-06-08 06:39:40 +0800 |
| commit | a1b49d8389844c9b2d62ded91b76a23deb060ab6 (patch) | |
| tree | 952a18314ed208926f9c14a9011dcc9c710049bb /packages | |
| parent | 12e2bfc794831c0008bdbfc27dad9509f2578057 (diff) | |
| download | dexon-0x-contracts-a1b49d8389844c9b2d62ded91b76a23deb060ab6.tar.gz dexon-0x-contracts-a1b49d8389844c9b2d62ded91b76a23deb060ab6.tar.zst dexon-0x-contracts-a1b49d8389844c9b2d62ded91b76a23deb060ab6.zip | |
Fixed after rebase
Diffstat (limited to 'packages')
3 files changed, 5 insertions, 5 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol index 4e9ae64f8..c8e8f4587 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol @@ -56,7 +56,7 @@ contract ERC20Proxy is // Data must be intended for this proxy. require( proxyId == PROXY_ID, - PROXY_ID_MISMATCH + ASSET_PROXY_ID_MISMATCH ); // Transfer tokens. @@ -93,7 +93,7 @@ contract ERC20Proxy is uint256 length = assetData.length; require( assetData.length == 21, - INVALID_ASSET_DATA_LENGTH + LENGTH_21_REQUIRED ); // Decode data diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol index f6c3af104..7de7968cc 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol @@ -109,7 +109,7 @@ contract ERC721Proxy is uint256 length = assetData.length; require( assetData.length >= 53, - INVALID_ASSET_DATA_LENGTH + LENGTH_AT_LEAST_53_REQUIRED ); // Decode asset data. diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol index e0c7fc796..80180a0d9 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/libs/LibAssetProxyErrors.sol @@ -29,9 +29,9 @@ contract LibAssetProxyErrors { /// AssetProxy errors /// string constant ASSET_PROXY_ID_MISMATCH = "ASSET_PROXY_ID_MISMATCH"; // Proxy id in metadata does not match this proxy id. string constant INVALID_AMOUNT = "INVALID_AMOUNT"; // Transfer amount must equal 1. - string constant TRANSFER_FAILED = "TRANSFER_FAILED"; // Transfer failed. + string constant TRANSFER_FAILED = "TRANSFER_FAILED"; // Transfer failed. /// Length validation errors /// string constant LENGTH_21_REQUIRED = "LENGTH_21_REQUIRED"; // Byte array must have a length of 21. - string constant LENGTH_53_REQUIRED = "LENGTH_53_REQUIRED"; // Byte array must have a length of 53. + string constant LENGTH_AT_LEAST_53_REQUIRED = "LENGTH_AT_LEAST_53_REQUIRED"; // Byte array must have a length of at least 53. } |