diff --git a/contracts/exchange/test/dispatcher.ts b/contracts/exchange/test/dispatcher.ts index 98fce27860..e26a28ae54 100644 --- a/contracts/exchange/test/dispatcher.ts +++ b/contracts/exchange/test/dispatcher.ts @@ -25,10 +25,7 @@ import { LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; import { artifacts } from './artifacts'; -import { - TestAssetProxyDispatcherAssetProxyRegisteredEventArgs, - TestAssetProxyDispatcherContract, -} from './wrappers'; +import { TestAssetProxyDispatcherAssetProxyRegisteredEventArgs, TestAssetProxyDispatcherContract } from './wrappers'; import { dependencyArtifacts } from './utils/dependency_artifacts'; diff --git a/contracts/exchange/test/match_orders.ts b/contracts/exchange/test/match_orders.ts index 7d602af50e..66714ee59e 100644 --- a/contracts/exchange/test/match_orders.ts +++ b/contracts/exchange/test/match_orders.ts @@ -33,9 +33,7 @@ import * as _ from 'lodash'; import { ExchangeWrapper } from './utils/exchange_wrapper'; import { artifacts } from './artifacts'; -import { - ExchangeContract, -} from './wrappers'; +import { ExchangeContract } from './wrappers'; import { MatchOrderTester, TokenBalances } from './utils/match_order_tester'; diff --git a/contracts/exchange/test/protocol_fees.ts b/contracts/exchange/test/protocol_fees.ts index abb6fc4f8a..c01cd6e9b5 100644 --- a/contracts/exchange/test/protocol_fees.ts +++ b/contracts/exchange/test/protocol_fees.ts @@ -2,7 +2,7 @@ import { blockchainTests } from '@0x/contracts-test-utils'; import { BigNumber } from '@0x/utils'; import { artifacts } from './artifacts'; -import { TestProtocolFeesContract, TestProtocolFeesReceiverContract} from './wrappers'; +import { TestProtocolFeesContract, TestProtocolFeesReceiverContract } from './wrappers'; // The contents of this test suite does not inform the reader about the assertions made in these // tests. For more information and a more accurate view of the tests, check out diff --git a/contracts/exchange/test/reentrancy_tests.ts b/contracts/exchange/test/reentrancy_tests.ts index 5f76f3d91a..148bfb60c1 100644 --- a/contracts/exchange/test/reentrancy_tests.ts +++ b/contracts/exchange/test/reentrancy_tests.ts @@ -4,7 +4,7 @@ import { DataItem, MethodAbi, TupleDataItem } from 'ethereum-types'; import * as _ from 'lodash'; import { artifacts } from './artifacts'; -import { ReentrancyTesterContract} from './wrappers'; +import { ReentrancyTesterContract } from './wrappers'; import { constants as TestConstants } from './utils/constants'; diff --git a/contracts/exchange/test/transactions_unit_tests.ts b/contracts/exchange/test/transactions_unit_tests.ts index 2f36606c4f..35e5aec284 100644 --- a/contracts/exchange/test/transactions_unit_tests.ts +++ b/contracts/exchange/test/transactions_unit_tests.ts @@ -6,10 +6,7 @@ import { LogWithDecodedArgs } from 'ethereum-types'; import * as _ from 'lodash'; import { artifacts } from './artifacts'; -import { - TestTransactionsContract, - TestTransactionsTransactionExecutionEventArgs, -} from './wrappers'; +import { TestTransactionsContract, TestTransactionsTransactionExecutionEventArgs } from './wrappers'; blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDefaults }) => { let transactionsContract: TestTransactionsContract; diff --git a/contracts/exchange/test/utils/isolated_exchange_wrapper.ts b/contracts/exchange/test/utils/isolated_exchange_wrapper.ts index c50dd1da80..0b94a9af97 100644 --- a/contracts/exchange/test/utils/isolated_exchange_wrapper.ts +++ b/contracts/exchange/test/utils/isolated_exchange_wrapper.ts @@ -18,7 +18,7 @@ import { IsolatedExchangeContract, IsolatedExchangeDispatchTransferFromCalledEventArgs as DispatchTransferFromCallArgs, IsolatedExchangeFillEventArgs as FillEventArgs, - } from '../wrappers'; +} from '../wrappers'; export interface AssetBalances { [assetData: string]: { [address: string]: BigNumber }; diff --git a/contracts/staking/test/actors/finalizer_actor.ts b/contracts/staking/test/actors/finalizer_actor.ts index ef2400e99b..e5b6c52754 100644 --- a/contracts/staking/test/actors/finalizer_actor.ts +++ b/contracts/staking/test/actors/finalizer_actor.ts @@ -2,7 +2,6 @@ import { constants, expect } from '@0x/contracts-test-utils'; import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; -import { StakingApiWrapper } from '../utils/api_wrapper'; import { BalanceByOwner, DelegatorBalancesByPoolId, @@ -13,6 +12,7 @@ import { RewardBalanceByPoolId, RewardByPoolId, } from '../../src/types'; +import { StakingApiWrapper } from '../utils/api_wrapper'; import { BaseActor } from './base_actor'; diff --git a/contracts/staking/test/actors/staker_actor.ts b/contracts/staking/test/actors/staker_actor.ts index ab5413c1f3..39a6a2cf90 100644 --- a/contracts/staking/test/actors/staker_actor.ts +++ b/contracts/staking/test/actors/staker_actor.ts @@ -2,8 +2,8 @@ import { expect } from '@0x/contracts-test-utils'; import { BigNumber, RevertError } from '@0x/utils'; import * as _ from 'lodash'; -import { StakingApiWrapper } from '../utils/api_wrapper'; import { StakeBalances, StakeInfo, StakeStatus, StoredBalance } from '../../src/types'; +import { StakingApiWrapper } from '../utils/api_wrapper'; import { BaseActor } from './base_actor'; diff --git a/contracts/staking/test/epoch_test.ts b/contracts/staking/test/epoch_test.ts index 978ad0126a..352a4c6d6b 100644 --- a/contracts/staking/test/epoch_test.ts +++ b/contracts/staking/test/epoch_test.ts @@ -2,9 +2,10 @@ import { ERC20Wrapper } from '@0x/contracts-asset-proxy'; import { blockchainTests, expect } from '@0x/contracts-test-utils'; import * as _ from 'lodash'; -import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper'; import { constants as stakingConstants } from '../src/constants'; +import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper'; + // tslint:disable:no-unnecessary-type-assertion blockchainTests('Epochs', env => { // tokens & addresses diff --git a/contracts/staking/test/migration_test.ts b/contracts/staking/test/migration_test.ts index 614e7f6bef..f1400b6310 100644 --- a/contracts/staking/test/migration_test.ts +++ b/contracts/staking/test/migration_test.ts @@ -2,6 +2,9 @@ import { blockchainTests, constants, expect, filterLogsToArguments } from '@0x/c import { StakingRevertErrors } from '@0x/order-utils'; import { AuthorizableRevertErrors, BigNumber, StringRevertError } from '@0x/utils'; +import { constants as stakingConstants } from '../src/constants'; + +import { artifacts } from './artifacts'; import { StakingContract, StakingProxyContract, @@ -11,10 +14,6 @@ import { TestStakingProxyStakingContractAttachedToProxyEventArgs, } from './wrappers'; -import { artifacts } from './artifacts'; - -import { constants as stakingConstants } from '../src/constants'; - blockchainTests('Migration tests', env => { let authorizedAddress: string; let notAuthorizedAddress: string; diff --git a/contracts/staking/test/pools_test.ts b/contracts/staking/test/pools_test.ts index 89e7c5417f..9bde7fbd24 100644 --- a/contracts/staking/test/pools_test.ts +++ b/contracts/staking/test/pools_test.ts @@ -3,10 +3,11 @@ import { blockchainTests, constants, expect } from '@0x/contracts-test-utils'; import { StakingRevertErrors } from '@0x/order-utils'; import * as _ from 'lodash'; +import { constants as stakingConstants } from '../src/constants'; + import { MakerActor } from './actors/maker_actor'; import { PoolOperatorActor } from './actors/pool_operator_actor'; import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper'; -import { constants as stakingConstants } from '../src/constants'; // tslint:disable:no-unnecessary-type-assertion // tslint:disable:max-file-line-count diff --git a/contracts/tests/test/dev-utils/order_validation_utils.ts b/contracts/tests/test/dev-utils/order_validation_utils.ts index ad579e7150..29a9ea9049 100644 --- a/contracts/tests/test/dev-utils/order_validation_utils.ts +++ b/contracts/tests/test/dev-utils/order_validation_utils.ts @@ -93,24 +93,15 @@ describe('OrderValidationUtils/OrderTransferSimulatorUtils', () => { txDefaults, artifacts, ); - await exchange.registerAssetProxy.awaitTransactionSuccessAsync( - erc20Proxy.address, - { - from: owner, - }, - ); - await exchange.registerAssetProxy.awaitTransactionSuccessAsync( - erc721Proxy.address, - { - from: owner, - }, - ); - await exchange.registerAssetProxy.awaitTransactionSuccessAsync( - multiAssetProxy.address, - { - from: owner, - }, - ); + await exchange.registerAssetProxy.awaitTransactionSuccessAsync(erc20Proxy.address, { + from: owner, + }); + await exchange.registerAssetProxy.awaitTransactionSuccessAsync(erc721Proxy.address, { + from: owner, + }); + await exchange.registerAssetProxy.awaitTransactionSuccessAsync(multiAssetProxy.address, { + from: owner, + }); await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(exchange.address, { from: owner }); await erc721Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(exchange.address, { from: owner });