diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-11-13 03:28:34 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-11-28 08:09:51 +0800 |
commit | 7b51eddc03762085050eba8dfcf3325360e85403 (patch) | |
tree | 0baec06054c993e7546ba512236815cd2f92547c /packages | |
parent | 6f92f0a7b5cc9aa9ccd3a1729d6e26da54ebaddf (diff) | |
download | dexon-0x-contracts-7b51eddc03762085050eba8dfcf3325360e85403.tar dexon-0x-contracts-7b51eddc03762085050eba8dfcf3325360e85403.tar.gz dexon-0x-contracts-7b51eddc03762085050eba8dfcf3325360e85403.tar.bz2 dexon-0x-contracts-7b51eddc03762085050eba8dfcf3325360e85403.tar.lz dexon-0x-contracts-7b51eddc03762085050eba8dfcf3325360e85403.tar.xz dexon-0x-contracts-7b51eddc03762085050eba8dfcf3325360e85403.tar.zst dexon-0x-contracts-7b51eddc03762085050eba8dfcf3325360e85403.zip |
Fix linting errors
Diffstat (limited to 'packages')
-rw-r--r-- | packages/contracts/contracts/protocol/AssetProxy/MultiAssetProxy.sol | 5 | ||||
-rw-r--r-- | packages/contracts/test/utils/erc721_wrapper.ts | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/packages/contracts/contracts/protocol/AssetProxy/MultiAssetProxy.sol b/packages/contracts/contracts/protocol/AssetProxy/MultiAssetProxy.sol index fc86ee942..6db42e44f 100644 --- a/packages/contracts/contracts/protocol/AssetProxy/MultiAssetProxy.sol +++ b/packages/contracts/contracts/protocol/AssetProxy/MultiAssetProxy.sol @@ -221,7 +221,10 @@ contract MultiAssetProxy is } // Load AssetProxy id - let assetProxyId := and(calldataload(nestedAssetDataElementContentsStart), 0xffffffff00000000000000000000000000000000000000000000000000000000) + let assetProxyId := and( + calldataload(nestedAssetDataElementContentsStart), + 0xffffffff00000000000000000000000000000000000000000000000000000000 + ) // To lookup a value in a mapping, we load from the storage location keccak256(k, p), // where k is the key left padded to 32 bytes and p is the storage slot diff --git a/packages/contracts/test/utils/erc721_wrapper.ts b/packages/contracts/test/utils/erc721_wrapper.ts index 9bd8fad01..e9da553d0 100644 --- a/packages/contracts/test/utils/erc721_wrapper.ts +++ b/packages/contracts/test/utils/erc721_wrapper.ts @@ -29,6 +29,7 @@ export class ERC721Wrapper { this._contractOwnerAddress = contractOwnerAddress; } public async deployDummyTokensAsync(): Promise<DummyERC721TokenContract[]> { + // tslint:disable-next-line:no-unused-variable for (const i of _.times(constants.NUM_DUMMY_ERC721_TO_DEPLOY)) { this._dummyTokenContracts.push( await DummyERC721TokenContract.deployFrom0xArtifactAsync( @@ -61,6 +62,7 @@ export class ERC721Wrapper { this._initialTokenIdsByOwner = {}; for (const dummyTokenContract of this._dummyTokenContracts) { for (const tokenOwnerAddress of this._tokenOwnerAddresses) { + // tslint:disable-next-line:no-unused-variable for (const i of _.times(constants.NUM_ERC721_TOKENS_TO_MINT)) { const tokenId = generatePseudoRandomSalt(); await this.mintAsync(dummyTokenContract.address, tokenId, tokenOwnerAddress); |