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

proxyData -> assetData

Browse Source
This commit is contained in:
Greg Hysen
2018-05-31 13:44:14 -07:00
parent 069b89b208
commit 5db15ca54c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/contracts/src/contracts/current/utils/LibAssetProxyDecoder/LibAssetProxyDecoder.sol
View File

@@ -29,7 +29,7 @@ contract LibAssetProxyDecoder is
string constant INVALID_ERC721_METADATA_LENGTH = "Metadata must have a length of at least 53."; string constant INVALID_ERC721_METADATA_LENGTH = "Metadata must have a length of at least 53.";
/// @dev Decodes ERC721 Asset Proxy data /// @dev Decodes ERC721 Asset Proxy data
function decodeERC20Data(bytes memory proxyData) function decodeERC20Data(bytes memory assetData)
internal internal
pure pure
returns ( returns (
@@ -38,17 +38,17 @@ contract LibAssetProxyDecoder is
) )
{ {
require( require(
proxyData.length == 21, assetData.length == 21,
INVALID_ERC20_METADATA_LENGTH INVALID_ERC20_METADATA_LENGTH
); );
proxyId = uint8(proxyData[0]); proxyId = uint8(assetData[0]);
token = readAddress(proxyData, 1); token = readAddress(assetData, 1);
return (proxyId, token); return (proxyId, token);
} }
/// @dev Decodes ERC721 Asset Proxy data /// @dev Decodes ERC721 Asset Proxy data
function decodeERC721Data(bytes memory proxyData) function decodeERC721Data(bytes memory assetData)
internal internal
pure pure
returns ( returns (
@@ -59,14 +59,14 @@ contract LibAssetProxyDecoder is
) )
{ {
require( require(
proxyData.length >= 53, assetData.length >= 53,
INVALID_ERC721_METADATA_LENGTH INVALID_ERC721_METADATA_LENGTH
); );
proxyId = uint8(proxyData[0]); proxyId = uint8(assetData[0]);
token = readAddress(proxyData, 1); token = readAddress(assetData, 1);
tokenId = readUint256(proxyData, 21); tokenId = readUint256(assetData, 21);
if (proxyData.length > 53) { if (assetData.length > 53) {
data = readBytes(proxyData, 53); data = readBytes(assetData, 53);
} }
return (proxyId, token, tokenId, data); return (proxyId, token, tokenId, data);

2
packages/contracts/test/libraries/lib_bytes.ts
View File

@@ -409,7 +409,7 @@ describe('LibBytes', () => {
}); });
}); });
describe.only('writeBytes', () => { describe('writeBytes', () => {
it('should successfully write short, nested array of bytes when it takes up the whole array)', async () => { it('should successfully write short, nested array of bytes when it takes up the whole array)', async () => {
const testBytesOffset = new BigNumber(0); const testBytesOffset = new BigNumber(0);
const emptyByteArray = ethUtil.bufferToHex(new Buffer(shortTestBytesAsBuffer.byteLength)); const emptyByteArray = ethUtil.bufferToHex(new Buffer(shortTestBytesAsBuffer.byteLength));