diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-23 00:25:02 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-23 00:25:02 +0800 |
| commit | 4a0c8d72b05152ee2fd71245873d5a70f7281058 (patch) | |
| tree | 2c28ad8214aaaa10913a621509d0ae4020ee4d3d /packages/contracts | |
| parent | d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3 (diff) | |
| parent | ab9cfd293b3ccc2aacb4238aebe2b033e55b7935 (diff) | |
| download | dexon-0x-contracts-4a0c8d72b05152ee2fd71245873d5a70f7281058.tar.gz dexon-0x-contracts-4a0c8d72b05152ee2fd71245873d5a70f7281058.tar.zst dexon-0x-contracts-4a0c8d72b05152ee2fd71245873d5a70f7281058.zip | |
merge development
Diffstat (limited to 'packages/contracts')
| -rw-r--r-- | packages/contracts/test/unlimited_allowance_token.ts | 4 | ||||
| -rw-r--r-- | packages/contracts/test/zrx_token.ts | 4 | ||||
| -rw-r--r-- | packages/contracts/tslint.json | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/packages/contracts/test/unlimited_allowance_token.ts b/packages/contracts/test/unlimited_allowance_token.ts index 8851a04ef..5ad9321e8 100644 --- a/packages/contracts/test/unlimited_allowance_token.ts +++ b/packages/contracts/test/unlimited_allowance_token.ts @@ -97,8 +97,8 @@ describe('UnlimitedAllowanceToken', () => { const amountToTransfer = ownerBalance; const spenderAllowance = await zeroEx.token.getAllowanceAsync(tokenAddress, owner, spender); - const spenderAllowanceIsInsufficient = spenderAllowance.cmp(amountToTransfer) < 0; - expect(spenderAllowanceIsInsufficient).to.be.true(); + const isSpenderAllowanceInsufficient = spenderAllowance.cmp(amountToTransfer) < 0; + expect(isSpenderAllowanceInsufficient).to.be.true(); return expect( token.transferFrom.callAsync(owner, spender, amountToTransfer, { diff --git a/packages/contracts/test/zrx_token.ts b/packages/contracts/test/zrx_token.ts index 7a72f85dc..48b8f6e36 100644 --- a/packages/contracts/test/zrx_token.ts +++ b/packages/contracts/test/zrx_token.ts @@ -118,8 +118,8 @@ describe('ZRXToken', () => { const amountToTransfer = ownerBalance; const spenderAllowance = await zeroEx.token.getAllowanceAsync(zrxAddress, owner, spender); - const spenderAllowanceIsInsufficient = spenderAllowance.cmp(amountToTransfer) < 0; - expect(spenderAllowanceIsInsufficient).to.be.true(); + const isSpenderAllowanceInsufficient = spenderAllowance.cmp(amountToTransfer) < 0; + expect(isSpenderAllowanceInsufficient).to.be.true(); const didReturnTrue = await zrxToken.transferFrom.callAsync(owner, spender, amountToTransfer, { from: spender, diff --git a/packages/contracts/tslint.json b/packages/contracts/tslint.json index ffaefe83a..1ab924e47 100644 --- a/packages/contracts/tslint.json +++ b/packages/contracts/tslint.json @@ -1,3 +1,6 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0xproject/tslint-config"], + "rules": { + "custom-no-magic-numbers": false + } } |