diff options
author | Greg Hysen <greg.hysen@gmail.com> | 2018-06-02 05:17:13 +0800 |
---|---|---|
committer | Greg Hysen <greg.hysen@gmail.com> | 2018-06-08 06:38:48 +0800 |
commit | e4e36760952287a84f8991df8589c183036383db (patch) | |
tree | 83c5ba694848232f6d3b01a72dc8c3d94cb9d071 /packages/contracts/test/libraries | |
parent | 3ed13150e106c19563c8e9b06621be3d44d66b6c (diff) | |
download | dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.gz dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.bz2 dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.lz dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.xz dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.zst dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.zip |
Fixed up after rebasing. Contracts build and tests pass
Diffstat (limited to 'packages/contracts/test/libraries')
-rw-r--r-- | packages/contracts/test/libraries/lib_bytes.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/contracts/test/libraries/lib_bytes.ts b/packages/contracts/test/libraries/lib_bytes.ts index 9fe3a1a57..1a23483ba 100644 --- a/packages/contracts/test/libraries/lib_bytes.ts +++ b/packages/contracts/test/libraries/lib_bytes.ts @@ -1,4 +1,6 @@ import { BlockchainLifecycle } from '@0xproject/dev-utils'; +import { generatePseudoRandomSalt } from '@0xproject/order-utils'; +import { AssetProxyId } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import BN = require('bn.js'); import * as chai from 'chai'; @@ -66,7 +68,7 @@ describe('LibBytes', () => { shortTestBytesAsBuffer = Buffer.concat([encodedShortDataLength, encodedShortData]); shortTestBytes = ethUtil.bufferToHex(shortTestBytesAsBuffer); // Create test bytes one word in length - wordOfData = ethUtil.bufferToHex(assetProxyUtils.encodeUint256(ZeroEx.generatePseudoRandomSalt())); + wordOfData = ethUtil.bufferToHex(assetProxyUtils.encodeUint256(generatePseudoRandomSalt())); const encodedWordOfData = ethUtil.toBuffer(wordOfData); const wordOfDataLength = new BigNumber(encodedWordOfData.byteLength); const encodedWordOfDataLength = assetProxyUtils.encodeUint256(wordOfDataLength); @@ -315,7 +317,6 @@ describe('LibBytes', () => { }); */ -======= describe('readFirst4', () => { // AssertionError: expected promise to be rejected with an error including 'revert' but it was fulfilled with '0x08c379a0' it('should revert if byte array has a length < 4', async () => { |