aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-12-07 01:55:09 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-12-07 01:55:09 +0800
commitf1b267cc9fe7f6e5566dc2535b064b92aef92df1 (patch)
treec07a9dd32c5b959d33587ce2d38098dfe397badb /packages/contracts/test
parent598f1dd2d8a89b0e3ab04b2917138997031bafc6 (diff)
downloaddexon-0x-contracts-f1b267cc9fe7f6e5566dc2535b064b92aef92df1.tar
dexon-0x-contracts-f1b267cc9fe7f6e5566dc2535b064b92aef92df1.tar.gz
dexon-0x-contracts-f1b267cc9fe7f6e5566dc2535b064b92aef92df1.tar.bz2
dexon-0x-contracts-f1b267cc9fe7f6e5566dc2535b064b92aef92df1.tar.lz
dexon-0x-contracts-f1b267cc9fe7f6e5566dc2535b064b92aef92df1.tar.xz
dexon-0x-contracts-f1b267cc9fe7f6e5566dc2535b064b92aef92df1.tar.zst
dexon-0x-contracts-f1b267cc9fe7f6e5566dc2535b064b92aef92df1.zip
Refactor web3Wrapper to a separate package
Diffstat (limited to 'packages/contracts/test')
-rw-r--r--packages/contracts/test/ts/ether_token.ts6
-rw-r--r--packages/contracts/test/ts/multi_sig_with_time_lock.ts6
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/contracts/test/ts/ether_token.ts b/packages/contracts/test/ts/ether_token.ts
index 857371578..dbb4d2ee6 100644
--- a/packages/contracts/test/ts/ether_token.ts
+++ b/packages/contracts/test/ts/ether_token.ts
@@ -1,7 +1,7 @@
import {ZeroEx, ZeroExError} from '0x.js';
+import {promisify} from '@0xproject/utils';
import {BigNumber} from 'bignumber.js';
import * as chai from 'chai';
-import promisify = require('es6-promisify');
import Web3 = require('web3');
import {Artifacts} from '../../util/artifacts';
@@ -30,9 +30,9 @@ contract('EtherToken', (accounts: string[]) => {
});
});
- const sendTransactionAsync = promisify(web3.eth.sendTransaction);
+ const sendTransactionAsync = promisify<string>(web3.eth.sendTransaction);
const getEthBalanceAsync = async (owner: string) => {
- const balanceStr = await promisify(web3.eth.getBalance)(owner);
+ const balanceStr = await promisify<string>(web3.eth.getBalance)(owner);
const balance = new BigNumber(balanceStr);
return balance;
};
diff --git a/packages/contracts/test/ts/multi_sig_with_time_lock.ts b/packages/contracts/test/ts/multi_sig_with_time_lock.ts
index 6ab3014ab..6dd4dc3b2 100644
--- a/packages/contracts/test/ts/multi_sig_with_time_lock.ts
+++ b/packages/contracts/test/ts/multi_sig_with_time_lock.ts
@@ -1,6 +1,6 @@
+import {promisify} from '@0xproject/utils';
import {BigNumber} from 'bignumber.js';
import * as chai from 'chai';
-import promisify = require('es6-promisify');
import Web3 = require('web3');
import * as multiSigWalletJSON from '../../build/contracts/MultiSigWalletWithTimeLock.json';
@@ -64,8 +64,8 @@ contract('MultiSigWalletWithTimeLock', (accounts: string[]) => {
it('should set confirmation time with enough confirmations', async () => {
const res = await multiSig.confirmTransaction(txId, {from: owners[1]});
expect(res.logs).to.have.length(2);
- const blockNum = await promisify(web3.eth.getBlockNumber)();
- const blockInfo = await promisify(web3.eth.getBlock)(blockNum);
+ const blockNum = await promisify<number>(web3.eth.getBlockNumber)();
+ const blockInfo = await promisify<Web3.BlockWithoutTransactionData>(web3.eth.getBlock)(blockNum);
const timestamp = new BigNumber(blockInfo.timestamp);
const confirmationTimeBigNum = new BigNumber(await multiSig.confirmationTimes.call(txId));