diff --git a/contracts/staking/test/rewards_test.ts b/contracts/staking/test/rewards_test.ts index 0f0c4f5172..a9da9181ad 100644 --- a/contracts/staking/test/rewards_test.ts +++ b/contracts/staking/test/rewards_test.ts @@ -4,12 +4,13 @@ import { StakingRevertErrors } from '@0x/order-utils'; import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; +import { DelegatorsByPoolId, OperatorByPoolId, StakeInfo, StakeStatus } from '../src/types'; + import { FinalizerActor } from './actors/finalizer_actor'; import { PoolOperatorActor } from './actors/pool_operator_actor'; import { StakerActor } from './actors/staker_actor'; import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper'; import { toBaseUnitAmount } from './utils/number_utils'; -import { DelegatorsByPoolId, OperatorByPoolId, StakeInfo, StakeStatus } from './utils/types'; // tslint:disable:no-unnecessary-type-assertion // tslint:disable:max-file-line-count diff --git a/contracts/staking/test/stake_test.ts b/contracts/staking/test/stake_test.ts index 065178d80a..aa5ca3cacb 100644 --- a/contracts/staking/test/stake_test.ts +++ b/contracts/staking/test/stake_test.ts @@ -4,10 +4,11 @@ import { StakingRevertErrors } from '@0x/order-utils'; import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; +import { StakeInfo, StakeStatus } from '../src/types'; + import { StakerActor } from './actors/staker_actor'; import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper'; import { toBaseUnitAmount } from './utils/number_utils'; -import { StakeInfo, StakeStatus } from './utils/types'; // tslint:disable:no-unnecessary-type-assertion blockchainTests.resets('Stake Statuses', env => { diff --git a/contracts/staking/test/unit_tests/finalizer_test.ts b/contracts/staking/test/unit_tests/finalizer_test.ts index 41a00af73d..04846e498b 100644 --- a/contracts/staking/test/unit_tests/finalizer_test.ts +++ b/contracts/staking/test/unit_tests/finalizer_test.ts @@ -12,8 +12,8 @@ import { BigNumber } from '@0x/utils'; import { LogEntry } from 'ethereum-types'; import * as _ from 'lodash'; +import { constants as stakingConstants } from '../../src/constants'; import { artifacts } from '../artifacts'; -import { constants as stakingConstants } from '.../src/constants'; import { assertIntegerRoughlyEquals, getRandomInteger, toBaseUnitAmount } from '../utils/number_utils'; import { diff --git a/contracts/staking/test/unit_tests/mixin_cumulative_rewards_test.ts b/contracts/staking/test/unit_tests/mixin_cumulative_rewards_test.ts index 657e0eef4e..8b9a4e161e 100644 --- a/contracts/staking/test/unit_tests/mixin_cumulative_rewards_test.ts +++ b/contracts/staking/test/unit_tests/mixin_cumulative_rewards_test.ts @@ -2,7 +2,7 @@ import { blockchainTests, expect } from '@0x/contracts-test-utils'; import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; -import { constants as stakingConstants } from '.../src/constants'; +import { constants as stakingConstants } from '../../src/constants'; import { toBaseUnitAmount } from '../utils/number_utils'; import { artifacts } from '../artifacts'; diff --git a/contracts/staking/test/unit_tests/mixin_scheduler_test.ts b/contracts/staking/test/unit_tests/mixin_scheduler_test.ts index d0edd90f2e..d13a8f4d29 100644 --- a/contracts/staking/test/unit_tests/mixin_scheduler_test.ts +++ b/contracts/staking/test/unit_tests/mixin_scheduler_test.ts @@ -3,7 +3,7 @@ import { StakingRevertErrors } from '@0x/order-utils'; import { BigNumber } from '@0x/utils'; import { LogWithDecodedArgs } from 'ethereum-types'; -import { constants as stakingConstants } from '.../src/constants'; +import { constants as stakingConstants } from '../../src/constants'; import { artifacts } from '../artifacts'; import { diff --git a/contracts/staking/test/unit_tests/mixin_stake_storage_test.ts b/contracts/staking/test/unit_tests/mixin_stake_storage_test.ts index 0e8b5a2965..c3da4d3487 100644 --- a/contracts/staking/test/unit_tests/mixin_stake_storage_test.ts +++ b/contracts/staking/test/unit_tests/mixin_stake_storage_test.ts @@ -2,7 +2,7 @@ import { blockchainTests, expect, Numberish } from '@0x/contracts-test-utils'; import { StakingRevertErrors } from '@0x/order-utils'; import { BigNumber } from '@0x/utils'; -import { constants } from '.../src/constants'; +import { constants } from '../../src/constants'; import { StoredBalance } from '../../src/types'; import { artifacts } from '../artifacts'; diff --git a/contracts/staking/test/unit_tests/params_test.ts b/contracts/staking/test/unit_tests/params_test.ts index 3a1b1a9d0a..146a267905 100644 --- a/contracts/staking/test/unit_tests/params_test.ts +++ b/contracts/staking/test/unit_tests/params_test.ts @@ -6,7 +6,7 @@ import * as _ from 'lodash'; import { artifacts } from '../artifacts'; import { IStakingEventsParamsSetEventArgs, TestMixinParamsContract } from '../wrappers'; -import { constants as stakingConstants } from '.../src/constants'; +import { constants as stakingConstants } from '../../src/constants'; import { StakingParams } from '../../src/types'; blockchainTests('Configurable Parameters unit tests', env => { diff --git a/contracts/staking/test/unit_tests/stake_balances_test.ts b/contracts/staking/test/unit_tests/stake_balances_test.ts index 688a1e5988..d4f28914df 100644 --- a/contracts/staking/test/unit_tests/stake_balances_test.ts +++ b/contracts/staking/test/unit_tests/stake_balances_test.ts @@ -11,7 +11,7 @@ import { BigNumber, SafeMathRevertErrors } from '@0x/utils'; import { artifacts } from '../artifacts'; import { TestMixinStakeBalancesContract } from '../wrappers'; -import { constants as stakingConstants } from '.../src/constants'; +import { constants as stakingConstants } from '../../src/constants'; import { StakeStatus, StoredBalance } from '../../src/types'; blockchainTests.resets('MixinStakeBalances unit tests', env => { diff --git a/contracts/staking/test/unit_tests/staking_proxy_test.ts b/contracts/staking/test/unit_tests/staking_proxy_test.ts index 627181b2b2..d89a87a6ab 100644 --- a/contracts/staking/test/unit_tests/staking_proxy_test.ts +++ b/contracts/staking/test/unit_tests/staking_proxy_test.ts @@ -11,7 +11,7 @@ import { TestStakingProxyUnitContract, } from '../wrappers'; -import { constants as stakingConstants } from '.../src/constants'; +import { constants as stakingConstants } from '../../src/constants'; blockchainTests.resets('StakingProxy unit tests', env => { const testString = 'Hello, World!'; diff --git a/contracts/staking/test/unit_tests/zrx_vault_test.ts b/contracts/staking/test/unit_tests/zrx_vault_test.ts index 229b88181c..031a78ef83 100644 --- a/contracts/staking/test/unit_tests/zrx_vault_test.ts +++ b/contracts/staking/test/unit_tests/zrx_vault_test.ts @@ -13,7 +13,7 @@ import { RevertReason } from '@0x/types'; import { AuthorizableRevertErrors, BigNumber, SafeMathRevertErrors } from '@0x/utils'; import { TransactionReceiptWithDecodedLogs } from 'ethereum-types'; -import { constants as stakingConstants } from '.../src/constants'; +import { constants as stakingConstants } from '../../src/constants'; import { artifacts } from '../artifacts'; import { diff --git a/contracts/staking/test/utils/api_wrapper.ts b/contracts/staking/test/utils/api_wrapper.ts index b186cfe9d1..f67c80bc84 100644 --- a/contracts/staking/test/utils/api_wrapper.ts +++ b/contracts/staking/test/utils/api_wrapper.ts @@ -17,8 +17,8 @@ import { ZrxVaultContract, } from '../wrappers'; -import { constants as stakingConstants } from './constants'; -import { DecodedLogs, EndOfEpochInfo, StakingParams } from './types'; +import { constants as stakingConstants } from '../../src/constants'; +import { DecodedLogs, EndOfEpochInfo, StakingParams } from '../../src/types'; export class StakingApiWrapper { // The address of the real Staking.sol contract diff --git a/contracts/staking/test/utils/cumulative_reward_tracking_simulation.ts b/contracts/staking/test/utils/cumulative_reward_tracking_simulation.ts index c7f591e28a..bcab706e61 100644 --- a/contracts/staking/test/utils/cumulative_reward_tracking_simulation.ts +++ b/contracts/staking/test/utils/cumulative_reward_tracking_simulation.ts @@ -3,12 +3,12 @@ import { BigNumber } from '@0x/utils'; import { DecodedLogEntry, TransactionReceiptWithDecodedLogs } from 'ethereum-types'; import * as _ from 'lodash'; +import { DecodedLogs, StakeInfo, StakeStatus } from '../../src/types'; import { artifacts } from '../artifacts'; import { TestCumulativeRewardTrackingContract, TestCumulativeRewardTrackingEvents } from '../wrappers'; import { StakingApiWrapper } from './api_wrapper'; import { toBaseUnitAmount } from './number_utils'; -import { DecodedLogs, StakeInfo, StakeStatus } from './types'; export enum TestAction { Finalize,