post-rebase woes
This commit is contained in:
parent
e7825206bf
commit
4f10d7f859
@ -4,6 +4,5 @@
|
|||||||
* -----------------------------------------------------------------------------
|
* -----------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
export * from '../generated-wrappers/dev_utils';
|
export * from '../generated-wrappers/dev_utils';
|
||||||
export * from '../generated-wrappers/eth_balance_checker';
|
|
||||||
export * from '../generated-wrappers/lib_asset_data';
|
export * from '../generated-wrappers/lib_asset_data';
|
||||||
export * from '../generated-wrappers/lib_transaction_decoder';
|
export * from '../generated-wrappers/lib_transaction_decoder';
|
||||||
|
@ -5,9 +5,9 @@ import { SignatureType, SignedZeroExTransaction, ZeroExTransaction } from '@0x/t
|
|||||||
import { BigNumber } from '@0x/utils';
|
import { BigNumber } from '@0x/utils';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { SimulationEnvironment } from '../simulation/simulation';
|
|
||||||
import { DeploymentManager } from '../deployment_manager';
|
|
||||||
import { AssertionResult } from '../../src/function_assertions';
|
import { AssertionResult } from '../../src/function_assertions';
|
||||||
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
|
import { SimulationEnvironment } from '../simulation/simulation';
|
||||||
|
|
||||||
export type Constructor<T = {}> = new (...args: any[]) => T;
|
export type Constructor<T = {}> = new (...args: any[]) => T;
|
||||||
|
|
||||||
|
@ -4,11 +4,11 @@ import '@azure/core-asynciterator-polyfill';
|
|||||||
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
|
import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
|
import { AssertionResult } from '../../src/function_assertions';
|
||||||
import {
|
import {
|
||||||
validCreateStakingPoolAssertion,
|
validCreateStakingPoolAssertion,
|
||||||
validDecreaseStakingPoolOperatorShareAssertion,
|
validDecreaseStakingPoolOperatorShareAssertion,
|
||||||
} from '../function-assertions';
|
} from '../function-assertions';
|
||||||
import { AssertionResult } from '../utils/function_assertions';
|
|
||||||
|
|
||||||
import { Actor, Constructor } from './base';
|
import { Actor, Constructor } from './base';
|
||||||
|
|
||||||
|
@ -4,8 +4,8 @@ import { BigNumber } from '@0x/utils';
|
|||||||
import '@azure/core-asynciterator-polyfill';
|
import '@azure/core-asynciterator-polyfill';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
|
import { AssertionResult } from '../../src/function_assertions';
|
||||||
import { validMoveStakeAssertion, validStakeAssertion, validUnstakeAssertion } from '../function-assertions';
|
import { validMoveStakeAssertion, validStakeAssertion, validUnstakeAssertion } from '../function-assertions';
|
||||||
import { AssertionResult } from '../utils/function_assertions';
|
|
||||||
|
|
||||||
import { Actor, Constructor } from './base';
|
import { Actor, Constructor } from './base';
|
||||||
|
|
||||||
|
@ -3,8 +3,8 @@ import { expect } from '@0x/contracts-test-utils';
|
|||||||
import { BigNumber, logUtils } from '@0x/utils';
|
import { BigNumber, logUtils } from '@0x/utils';
|
||||||
import { TxData } from 'ethereum-types';
|
import { TxData } from 'ethereum-types';
|
||||||
|
|
||||||
import { DeploymentManager } from '../utils/deployment_manager';
|
import { FunctionAssertion, FunctionResult } from '../../src/function_assertions';
|
||||||
import { FunctionAssertion, FunctionResult } from '../utils/function_assertions';
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
|
|
||||||
// tslint:disable:no-unnecessary-type-assertion
|
// tslint:disable:no-unnecessary-type-assertion
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@ import { StakingPoolById } from '@0x/contracts-staking';
|
|||||||
import { expect } from '@0x/contracts-test-utils';
|
import { expect } from '@0x/contracts-test-utils';
|
||||||
import { logUtils } from '@0x/utils';
|
import { logUtils } from '@0x/utils';
|
||||||
|
|
||||||
import { DeploymentManager } from '../utils/deployment_manager';
|
import { FunctionAssertion, FunctionResult } from '../../src/function_assertions';
|
||||||
import { FunctionAssertion, FunctionResult } from '../utils/function_assertions';
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a FunctionAssertion for `decreaseStakingPoolOperatorShare` which assumes valid input is
|
* Returns a FunctionAssertion for `decreaseStakingPoolOperatorShare` which assumes valid input is
|
||||||
|
@ -11,8 +11,8 @@ import { BigNumber, logUtils } from '@0x/utils';
|
|||||||
import { TxData } from 'ethereum-types';
|
import { TxData } from 'ethereum-types';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { DeploymentManager } from '../utils/deployment_manager';
|
import { FunctionAssertion } from '../../src/function_assertions';
|
||||||
import { FunctionAssertion } from '../utils/function_assertions';
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
|
|
||||||
function incrementNextEpochBalance(stakeBalance: StoredBalance, amount: BigNumber): void {
|
function incrementNextEpochBalance(stakeBalance: StoredBalance, amount: BigNumber): void {
|
||||||
_.update(stakeBalance, ['nextEpochBalance'], balance => (balance || constants.ZERO_AMOUNT).plus(amount));
|
_.update(stakeBalance, ['nextEpochBalance'], balance => (balance || constants.ZERO_AMOUNT).plus(amount));
|
||||||
|
@ -4,8 +4,8 @@ import { expect } from '@0x/contracts-test-utils';
|
|||||||
import { BigNumber, logUtils } from '@0x/utils';
|
import { BigNumber, logUtils } from '@0x/utils';
|
||||||
import { TxData } from 'ethereum-types';
|
import { TxData } from 'ethereum-types';
|
||||||
|
|
||||||
import { DeploymentManager } from '../utils/deployment_manager';
|
import { FunctionAssertion, FunctionResult } from '../../src/function_assertions';
|
||||||
import { FunctionAssertion, FunctionResult } from '../utils/function_assertions';
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
|
|
||||||
function expectedUndelegatedStake(
|
function expectedUndelegatedStake(
|
||||||
initStake: OwnerStakeByStatus | GlobalStakeByStatus,
|
initStake: OwnerStakeByStatus | GlobalStakeByStatus,
|
||||||
|
@ -4,8 +4,8 @@ import { expect } from '@0x/contracts-test-utils';
|
|||||||
import { BigNumber, logUtils } from '@0x/utils';
|
import { BigNumber, logUtils } from '@0x/utils';
|
||||||
import { TxData } from 'ethereum-types';
|
import { TxData } from 'ethereum-types';
|
||||||
|
|
||||||
import { DeploymentManager } from '../utils/deployment_manager';
|
import { FunctionAssertion, FunctionResult } from '../../src/function_assertions';
|
||||||
import { FunctionAssertion, FunctionResult } from '../utils/function_assertions';
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
|
|
||||||
function expectedUndelegatedStake(
|
function expectedUndelegatedStake(
|
||||||
initStake: OwnerStakeByStatus | GlobalStakeByStatus,
|
initStake: OwnerStakeByStatus | GlobalStakeByStatus,
|
||||||
|
@ -2,9 +2,9 @@ import { BlockchainBalanceStore } from '@0x/contracts-exchange';
|
|||||||
import { blockchainTests } from '@0x/contracts-test-utils';
|
import { blockchainTests } from '@0x/contracts-test-utils';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
|
import { AssertionResult } from '../../src/function_assertions';
|
||||||
import { PoolOperator } from '../actors';
|
import { PoolOperator } from '../actors';
|
||||||
import { DeploymentManager } from '../utils/deployment_manager';
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
import { AssertionResult } from '../utils/function_assertions';
|
|
||||||
|
|
||||||
import { Simulation, SimulationEnvironment } from './simulation';
|
import { Simulation, SimulationEnvironment } from './simulation';
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@ import { BlockchainBalanceStore } from '@0x/contracts-exchange';
|
|||||||
import { GlobalStakeByStatus, StakeStatus, StakingPoolById, StoredBalance } from '@0x/contracts-staking';
|
import { GlobalStakeByStatus, StakeStatus, StakingPoolById, StoredBalance } from '@0x/contracts-staking';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import { DeploymentManager } from '../utils/deployment_manager';
|
import { AssertionResult } from '../../src/function_assertions';
|
||||||
import { AssertionResult } from '../utils/function_assertions';
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
|
|
||||||
// tslint:disable:max-classes-per-file
|
// tslint:disable:max-classes-per-file
|
||||||
|
|
||||||
|
@ -2,9 +2,9 @@ import { BlockchainBalanceStore } from '@0x/contracts-exchange';
|
|||||||
import { blockchainTests } from '@0x/contracts-test-utils';
|
import { blockchainTests } from '@0x/contracts-test-utils';
|
||||||
import * as _ from 'lodash';
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
|
import { AssertionResult } from '../../src/function_assertions';
|
||||||
import { Staker } from '../actors';
|
import { Staker } from '../actors';
|
||||||
import { DeploymentManager } from '../utils/deployment_manager';
|
import { DeploymentManager } from '../deployment_manager';
|
||||||
import { AssertionResult } from '../utils/function_assertions';
|
|
||||||
|
|
||||||
import { PoolManagementSimulation } from './pool_management_test';
|
import { PoolManagementSimulation } from './pool_management_test';
|
||||||
import { Simulation, SimulationEnvironment } from './simulation';
|
import { Simulation, SimulationEnvironment } from './simulation';
|
||||||
|
@ -4,6 +4,6 @@
|
|||||||
"custom-no-magic-numbers": false
|
"custom-no-magic-numbers": false
|
||||||
},
|
},
|
||||||
"linterOptions": {
|
"linterOptions": {
|
||||||
"exclude": ["src/artifacts.ts"]
|
"exclude": ["src/artifacts.ts", "test/artifacts.ts"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,11 @@
|
|||||||
export * from './wrappers';
|
export * from './wrappers';
|
||||||
export * from './artifacts';
|
export * from './artifacts';
|
||||||
export { constants } from './constants';
|
export { constants } from './constants';
|
||||||
export { StakeInfo, StakeStatus } from './types';
|
export {
|
||||||
|
GlobalStakeByStatus,
|
||||||
|
OwnerStakeByStatus,
|
||||||
|
StakeInfo,
|
||||||
|
StakingPoolById,
|
||||||
|
StakeStatus,
|
||||||
|
StoredBalance,
|
||||||
|
} from './types';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user