Fix prettier issues
This commit is contained in:
parent
d91a7b6d0e
commit
fc824b8d06
@ -25,10 +25,7 @@ import { LogWithDecodedArgs } from 'ethereum-types';
|
|||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { artifacts } from './artifacts';
|
import { artifacts } from './artifacts';
|
||||||
import {
|
import { TestAssetProxyDispatcherAssetProxyRegisteredEventArgs, TestAssetProxyDispatcherContract } from './wrappers';
|
||||||
TestAssetProxyDispatcherAssetProxyRegisteredEventArgs,
|
|
||||||
TestAssetProxyDispatcherContract,
|
|
||||||
} from './wrappers';
|
|
||||||
|
|
||||||
import { dependencyArtifacts } from './utils/dependency_artifacts';
|
import { dependencyArtifacts } from './utils/dependency_artifacts';
|
||||||
|
|
||||||
|
@ -33,9 +33,7 @@ import * as _ from 'lodash';
|
|||||||
import { ExchangeWrapper } from './utils/exchange_wrapper';
|
import { ExchangeWrapper } from './utils/exchange_wrapper';
|
||||||
|
|
||||||
import { artifacts } from './artifacts';
|
import { artifacts } from './artifacts';
|
||||||
import {
|
import { ExchangeContract } from './wrappers';
|
||||||
ExchangeContract,
|
|
||||||
} from './wrappers';
|
|
||||||
|
|
||||||
import { MatchOrderTester, TokenBalances } from './utils/match_order_tester';
|
import { MatchOrderTester, TokenBalances } from './utils/match_order_tester';
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import { blockchainTests } from '@0x/contracts-test-utils';
|
|||||||
import { BigNumber } from '@0x/utils';
|
import { BigNumber } from '@0x/utils';
|
||||||
|
|
||||||
import { artifacts } from './artifacts';
|
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
|
// 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
|
// tests. For more information and a more accurate view of the tests, check out
|
||||||
|
@ -4,7 +4,7 @@ import { DataItem, MethodAbi, TupleDataItem } from 'ethereum-types';
|
|||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { artifacts } from './artifacts';
|
import { artifacts } from './artifacts';
|
||||||
import { ReentrancyTesterContract} from './wrappers';
|
import { ReentrancyTesterContract } from './wrappers';
|
||||||
|
|
||||||
import { constants as TestConstants } from './utils/constants';
|
import { constants as TestConstants } from './utils/constants';
|
||||||
|
|
||||||
|
@ -6,10 +6,7 @@ import { LogWithDecodedArgs } from 'ethereum-types';
|
|||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { artifacts } from './artifacts';
|
import { artifacts } from './artifacts';
|
||||||
import {
|
import { TestTransactionsContract, TestTransactionsTransactionExecutionEventArgs } from './wrappers';
|
||||||
TestTransactionsContract,
|
|
||||||
TestTransactionsTransactionExecutionEventArgs,
|
|
||||||
} from './wrappers';
|
|
||||||
|
|
||||||
blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDefaults }) => {
|
blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDefaults }) => {
|
||||||
let transactionsContract: TestTransactionsContract;
|
let transactionsContract: TestTransactionsContract;
|
||||||
|
@ -18,7 +18,7 @@ import {
|
|||||||
IsolatedExchangeContract,
|
IsolatedExchangeContract,
|
||||||
IsolatedExchangeDispatchTransferFromCalledEventArgs as DispatchTransferFromCallArgs,
|
IsolatedExchangeDispatchTransferFromCalledEventArgs as DispatchTransferFromCallArgs,
|
||||||
IsolatedExchangeFillEventArgs as FillEventArgs,
|
IsolatedExchangeFillEventArgs as FillEventArgs,
|
||||||
} from '../wrappers';
|
} from '../wrappers';
|
||||||
|
|
||||||
export interface AssetBalances {
|
export interface AssetBalances {
|
||||||
[assetData: string]: { [address: string]: BigNumber };
|
[assetData: string]: { [address: string]: BigNumber };
|
||||||
|
@ -2,7 +2,6 @@ import { constants, expect } from '@0x/contracts-test-utils';
|
|||||||
import { BigNumber } from '@0x/utils';
|
import { BigNumber } from '@0x/utils';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { StakingApiWrapper } from '../utils/api_wrapper';
|
|
||||||
import {
|
import {
|
||||||
BalanceByOwner,
|
BalanceByOwner,
|
||||||
DelegatorBalancesByPoolId,
|
DelegatorBalancesByPoolId,
|
||||||
@ -13,6 +12,7 @@ import {
|
|||||||
RewardBalanceByPoolId,
|
RewardBalanceByPoolId,
|
||||||
RewardByPoolId,
|
RewardByPoolId,
|
||||||
} from '../../src/types';
|
} from '../../src/types';
|
||||||
|
import { StakingApiWrapper } from '../utils/api_wrapper';
|
||||||
|
|
||||||
import { BaseActor } from './base_actor';
|
import { BaseActor } from './base_actor';
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@ import { expect } from '@0x/contracts-test-utils';
|
|||||||
import { BigNumber, RevertError } from '@0x/utils';
|
import { BigNumber, RevertError } from '@0x/utils';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { StakingApiWrapper } from '../utils/api_wrapper';
|
|
||||||
import { StakeBalances, StakeInfo, StakeStatus, StoredBalance } from '../../src/types';
|
import { StakeBalances, StakeInfo, StakeStatus, StoredBalance } from '../../src/types';
|
||||||
|
import { StakingApiWrapper } from '../utils/api_wrapper';
|
||||||
|
|
||||||
import { BaseActor } from './base_actor';
|
import { BaseActor } from './base_actor';
|
||||||
|
|
||||||
|
@ -2,9 +2,10 @@ import { ERC20Wrapper } from '@0x/contracts-asset-proxy';
|
|||||||
import { blockchainTests, expect } from '@0x/contracts-test-utils';
|
import { blockchainTests, expect } from '@0x/contracts-test-utils';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper';
|
|
||||||
import { constants as stakingConstants } from '../src/constants';
|
import { constants as stakingConstants } from '../src/constants';
|
||||||
|
|
||||||
|
import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper';
|
||||||
|
|
||||||
// tslint:disable:no-unnecessary-type-assertion
|
// tslint:disable:no-unnecessary-type-assertion
|
||||||
blockchainTests('Epochs', env => {
|
blockchainTests('Epochs', env => {
|
||||||
// tokens & addresses
|
// tokens & addresses
|
||||||
|
@ -2,6 +2,9 @@ import { blockchainTests, constants, expect, filterLogsToArguments } from '@0x/c
|
|||||||
import { StakingRevertErrors } from '@0x/order-utils';
|
import { StakingRevertErrors } from '@0x/order-utils';
|
||||||
import { AuthorizableRevertErrors, BigNumber, StringRevertError } from '@0x/utils';
|
import { AuthorizableRevertErrors, BigNumber, StringRevertError } from '@0x/utils';
|
||||||
|
|
||||||
|
import { constants as stakingConstants } from '../src/constants';
|
||||||
|
|
||||||
|
import { artifacts } from './artifacts';
|
||||||
import {
|
import {
|
||||||
StakingContract,
|
StakingContract,
|
||||||
StakingProxyContract,
|
StakingProxyContract,
|
||||||
@ -11,10 +14,6 @@ import {
|
|||||||
TestStakingProxyStakingContractAttachedToProxyEventArgs,
|
TestStakingProxyStakingContractAttachedToProxyEventArgs,
|
||||||
} from './wrappers';
|
} from './wrappers';
|
||||||
|
|
||||||
import { artifacts } from './artifacts';
|
|
||||||
|
|
||||||
import { constants as stakingConstants } from '../src/constants';
|
|
||||||
|
|
||||||
blockchainTests('Migration tests', env => {
|
blockchainTests('Migration tests', env => {
|
||||||
let authorizedAddress: string;
|
let authorizedAddress: string;
|
||||||
let notAuthorizedAddress: string;
|
let notAuthorizedAddress: string;
|
||||||
|
@ -3,10 +3,11 @@ import { blockchainTests, constants, expect } from '@0x/contracts-test-utils';
|
|||||||
import { StakingRevertErrors } from '@0x/order-utils';
|
import { StakingRevertErrors } from '@0x/order-utils';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
|
import { constants as stakingConstants } from '../src/constants';
|
||||||
|
|
||||||
import { MakerActor } from './actors/maker_actor';
|
import { MakerActor } from './actors/maker_actor';
|
||||||
import { PoolOperatorActor } from './actors/pool_operator_actor';
|
import { PoolOperatorActor } from './actors/pool_operator_actor';
|
||||||
import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper';
|
import { deployAndConfigureContractsAsync, StakingApiWrapper } from './utils/api_wrapper';
|
||||||
import { constants as stakingConstants } from '../src/constants';
|
|
||||||
|
|
||||||
// tslint:disable:no-unnecessary-type-assertion
|
// tslint:disable:no-unnecessary-type-assertion
|
||||||
// tslint:disable:max-file-line-count
|
// tslint:disable:max-file-line-count
|
||||||
|
@ -93,24 +93,15 @@ describe('OrderValidationUtils/OrderTransferSimulatorUtils', () => {
|
|||||||
txDefaults,
|
txDefaults,
|
||||||
artifacts,
|
artifacts,
|
||||||
);
|
);
|
||||||
await exchange.registerAssetProxy.awaitTransactionSuccessAsync(
|
await exchange.registerAssetProxy.awaitTransactionSuccessAsync(erc20Proxy.address, {
|
||||||
erc20Proxy.address,
|
from: owner,
|
||||||
{
|
});
|
||||||
from: owner,
|
await exchange.registerAssetProxy.awaitTransactionSuccessAsync(erc721Proxy.address, {
|
||||||
},
|
from: owner,
|
||||||
);
|
});
|
||||||
await exchange.registerAssetProxy.awaitTransactionSuccessAsync(
|
await exchange.registerAssetProxy.awaitTransactionSuccessAsync(multiAssetProxy.address, {
|
||||||
erc721Proxy.address,
|
from: owner,
|
||||||
{
|
});
|
||||||
from: owner,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
await exchange.registerAssetProxy.awaitTransactionSuccessAsync(
|
|
||||||
multiAssetProxy.address,
|
|
||||||
{
|
|
||||||
from: owner,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(exchange.address, { from: owner });
|
await erc20Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(exchange.address, { from: owner });
|
||||||
await erc721Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(exchange.address, { from: owner });
|
await erc721Proxy.addAuthorizedAddress.awaitTransactionSuccessAsync(exchange.address, { from: owner });
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user