aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/multisig/multi_sig_with_time_lock.ts
diff options
context:
space:
mode:
authorAlex Browne <stephenalexbrowne@gmail.com>2018-07-18 01:57:39 +0800
committerGitHub <noreply@github.com>2018-07-18 01:57:39 +0800
commitb18d2b02745176400aa8cb5e97eb5f2685ca7be2 (patch)
tree3729bbcd47422bd3354bb58fdc027ee388185130 /packages/contracts/test/multisig/multi_sig_with_time_lock.ts
parent15e92958d6e908fde7dabb92aa596adfaeb0eece (diff)
parent9828fa335ea0e52da96c7339854970df33027d65 (diff)
downloaddexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar
dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.gz
dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.bz2
dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.lz
dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.xz
dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.zst
dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.zip
Merge pull request #881 from 0xProject/fix/timestamp-conversions
Fix bugs having to do with block timestamps and order expirationTimes
Diffstat (limited to 'packages/contracts/test/multisig/multi_sig_with_time_lock.ts')
-rw-r--r--packages/contracts/test/multisig/multi_sig_with_time_lock.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contracts/test/multisig/multi_sig_with_time_lock.ts b/packages/contracts/test/multisig/multi_sig_with_time_lock.ts
index a8e9243a9..8eeeeca6b 100644
--- a/packages/contracts/test/multisig/multi_sig_with_time_lock.ts
+++ b/packages/contracts/test/multisig/multi_sig_with_time_lock.ts
@@ -9,9 +9,9 @@ import {
} from '../../generated_contract_wrappers/multi_sig_wallet_with_time_lock';
import { artifacts } from '../utils/artifacts';
import { expectTransactionFailedWithoutReasonAsync } from '../utils/assertions';
+import { increaseTimeAndMineBlockAsync } from '../utils/block_timestamp';
import { chaiSetup } from '../utils/chai_setup';
import { constants } from '../utils/constants';
-import { increaseTimeAndMineBlockAsync } from '../utils/increase_time';
import { MultiSigWrapper } from '../utils/multi_sig_wrapper';
import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';