diff options
| author | Alex Browne <stephenalexbrowne@gmail.com> | 2018-05-22 07:39:07 +0800 |
|---|---|---|
| committer | Alex Browne <stephenalexbrowne@gmail.com> | 2018-05-22 07:52:49 +0800 |
| commit | 2c496a92adaef4132f6b0a135e61bad7b26b18bd (patch) | |
| tree | 15466ce417120907a7b950c22e8e23230c09f746 /packages/contracts/test/multi_sig_with_time_lock.ts | |
| parent | 4ca8903a21d5a78ace5bff3fc5bbc917e369cbfe (diff) | |
| download | dexon-sol-tools-2c496a92adaef4132f6b0a135e61bad7b26b18bd.tar dexon-sol-tools-2c496a92adaef4132f6b0a135e61bad7b26b18bd.tar.gz dexon-sol-tools-2c496a92adaef4132f6b0a135e61bad7b26b18bd.tar.bz2 dexon-sol-tools-2c496a92adaef4132f6b0a135e61bad7b26b18bd.tar.lz dexon-sol-tools-2c496a92adaef4132f6b0a135e61bad7b26b18bd.tar.xz dexon-sol-tools-2c496a92adaef4132f6b0a135e61bad7b26b18bd.tar.zst dexon-sol-tools-2c496a92adaef4132f6b0a135e61bad7b26b18bd.zip | |
Add awaitTransactionMinedAsync after every sent transaction
Diffstat (limited to 'packages/contracts/test/multi_sig_with_time_lock.ts')
| -rw-r--r-- | packages/contracts/test/multi_sig_with_time_lock.ts | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/packages/contracts/test/multi_sig_with_time_lock.ts b/packages/contracts/test/multi_sig_with_time_lock.ts index 784f41d24..e467df0d7 100644 --- a/packages/contracts/test/multi_sig_with_time_lock.ts +++ b/packages/contracts/test/multi_sig_with_time_lock.ts @@ -107,7 +107,7 @@ describe('MultiSigWalletWithTimeLock', () => { txId = log.args.transactionId; txHash = await multiSig.confirmTransaction.sendTransactionAsync(txId, { from: owners[1] }); - const res = await zeroEx.awaitTransactionMinedAsync(txHash); + const res = await zeroEx.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); expect(res.logs).to.have.length(2); const blockNum = await web3Wrapper.getBlockNumberAsync(); @@ -134,10 +134,12 @@ describe('MultiSigWalletWithTimeLock', () => { txId = log.args.transactionId; txHash = await multiSig.confirmTransaction.sendTransactionAsync(txId, { from: owners[1] }); + await web3Wrapper.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); expect(initialSecondsTimeLocked).to.be.equal(0); txHash = await multiSig.executeTransaction.sendTransactionAsync(txId, { from: owners[0] }); + await web3Wrapper.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); const res = await zeroEx.awaitTransactionMinedAsync(txHash); expect(res.logs).to.have.length(2); @@ -181,7 +183,8 @@ describe('MultiSigWalletWithTimeLock', () => { txHash = await multiSig.confirmTransaction.sendTransactionAsync(txId, { from: owners[1], }); - const confRes = await zeroEx.awaitTransactionMinedAsync(txHash); + await web3Wrapper.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); + const confRes = await zeroEx.awaitTransactionMinedAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); expect(confRes.logs).to.have.length(2); }); const newSecondsTimeLocked = 0; @@ -193,7 +196,10 @@ describe('MultiSigWalletWithTimeLock', () => { it('should execute if it has enough confirmations and is past the time lock', async () => { await web3Wrapper.increaseTimeAsync(SECONDS_TIME_LOCKED.toNumber()); - await multiSig.executeTransaction.sendTransactionAsync(txId, { from: owners[0] }); + await web3Wrapper.awaitTransactionMinedAsync( + await multiSig.executeTransaction.sendTransactionAsync(txId, { from: owners[0] }), + constants.AWAIT_TRANSACTION_MINED_MS, + ); const secondsTimeLocked = new BigNumber(await multiSig.secondsTimeLocked.callAsync()); expect(secondsTimeLocked).to.be.bignumber.equal(newSecondsTimeLocked); |