post-rebase woes

contracts/dev-utils/src/wrappers.ts

@@ -4,6 +4,5 @@
  * -----------------------------------------------------------------------------
  */
 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_transaction_decoder';

contracts/integrations/test/actors/base.ts

@@ -5,9 +5,9 @@ import { SignatureType, SignedZeroExTransaction, ZeroExTransaction } from '@0x/t
 import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
-import { SimulationEnvironment } from '../simulation/simulation';
-import { DeploymentManager } from '../deployment_manager';
 import { AssertionResult } from '../../src/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
+import { SimulationEnvironment } from '../simulation/simulation';
 
 export type Constructor<T = {}> = new (...args: any[]) => T;
 

contracts/integrations/test/actors/pool_operator.ts

@@ -4,11 +4,11 @@ import '@azure/core-asynciterator-polyfill';
 import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 
+import { AssertionResult } from '../../src/function_assertions';
 import {
     validCreateStakingPoolAssertion,
     validDecreaseStakingPoolOperatorShareAssertion,
 } from '../function-assertions';
-import { AssertionResult } from '../utils/function_assertions';
 
 import { Actor, Constructor } from './base';
 

contracts/integrations/test/actors/staker.ts

@@ -4,8 +4,8 @@ import { BigNumber } from '@0x/utils';
 import '@azure/core-asynciterator-polyfill';
 import * as _ from 'lodash';
 
+import { AssertionResult } from '../../src/function_assertions';
 import { validMoveStakeAssertion, validStakeAssertion, validUnstakeAssertion } from '../function-assertions';
-import { AssertionResult } from '../utils/function_assertions';
 
 import { Actor, Constructor } from './base';
 

contracts/integrations/test/function-assertions/createStakingPool.ts

@@ -3,8 +3,8 @@ import { expect } from '@0x/contracts-test-utils';
 import { BigNumber, logUtils } from '@0x/utils';
 import { TxData } from 'ethereum-types';
 
-import { DeploymentManager } from '../utils/deployment_manager';
-import { FunctionAssertion, FunctionResult } from '../utils/function_assertions';
+import { FunctionAssertion, FunctionResult } from '../../src/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
 
 // tslint:disable:no-unnecessary-type-assertion
 

contracts/integrations/test/function-assertions/decreaseStakingPoolOperatorShare.ts

@@ -2,8 +2,8 @@ import { StakingPoolById } from '@0x/contracts-staking';
 import { expect } from '@0x/contracts-test-utils';
 import { logUtils } from '@0x/utils';
 
-import { DeploymentManager } from '../utils/deployment_manager';
-import { FunctionAssertion, FunctionResult } from '../utils/function_assertions';
+import { FunctionAssertion, FunctionResult } from '../../src/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
 
 /**
  * Returns a FunctionAssertion for `decreaseStakingPoolOperatorShare` which assumes valid input is

contracts/integrations/test/function-assertions/moveStake.ts

@@ -11,8 +11,8 @@ import { BigNumber, logUtils } from '@0x/utils';
 import { TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { DeploymentManager } from '../utils/deployment_manager';
-import { FunctionAssertion } from '../utils/function_assertions';
+import { FunctionAssertion } from '../../src/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
 
 function incrementNextEpochBalance(stakeBalance: StoredBalance, amount: BigNumber): void {
     _.update(stakeBalance, ['nextEpochBalance'], balance => (balance || constants.ZERO_AMOUNT).plus(amount));

contracts/integrations/test/function-assertions/stake.ts

@@ -4,8 +4,8 @@ import { expect } from '@0x/contracts-test-utils';
 import { BigNumber, logUtils } from '@0x/utils';
 import { TxData } from 'ethereum-types';
 
-import { DeploymentManager } from '../utils/deployment_manager';
-import { FunctionAssertion, FunctionResult } from '../utils/function_assertions';
+import { FunctionAssertion, FunctionResult } from '../../src/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
 
 function expectedUndelegatedStake(
     initStake: OwnerStakeByStatus | GlobalStakeByStatus,

contracts/integrations/test/function-assertions/unstake.ts

@@ -4,8 +4,8 @@ import { expect } from '@0x/contracts-test-utils';
 import { BigNumber, logUtils } from '@0x/utils';
 import { TxData } from 'ethereum-types';
 
-import { DeploymentManager } from '../utils/deployment_manager';
-import { FunctionAssertion, FunctionResult } from '../utils/function_assertions';
+import { FunctionAssertion, FunctionResult } from '../../src/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
 
 function expectedUndelegatedStake(
     initStake: OwnerStakeByStatus | GlobalStakeByStatus,

contracts/integrations/test/simulation/pool_management_test.ts

@@ -2,9 +2,9 @@ import { BlockchainBalanceStore } from '@0x/contracts-exchange';
 import { blockchainTests } from '@0x/contracts-test-utils';
 import * as _ from 'lodash';
 
+import { AssertionResult } from '../../src/function_assertions';
 import { PoolOperator } from '../actors';
-import { DeploymentManager } from '../utils/deployment_manager';
-import { AssertionResult } from '../utils/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
 
 import { Simulation, SimulationEnvironment } from './simulation';
 

contracts/integrations/test/simulation/simulation.ts

@@ -2,8 +2,8 @@ import { BlockchainBalanceStore } from '@0x/contracts-exchange';
 import { GlobalStakeByStatus, StakeStatus, StakingPoolById, StoredBalance } from '@0x/contracts-staking';
 import * as _ from 'lodash';
 
-import { DeploymentManager } from '../utils/deployment_manager';
-import { AssertionResult } from '../utils/function_assertions';
+import { AssertionResult } from '../../src/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
 
 // tslint:disable:max-classes-per-file
 

contracts/integrations/test/simulation/stake_management_test.ts

@@ -2,9 +2,9 @@ import { BlockchainBalanceStore } from '@0x/contracts-exchange';
 import { blockchainTests } from '@0x/contracts-test-utils';
 import * as _ from 'lodash';
 
+import { AssertionResult } from '../../src/function_assertions';
 import { Staker } from '../actors';
-import { DeploymentManager } from '../utils/deployment_manager';
-import { AssertionResult } from '../utils/function_assertions';
+import { DeploymentManager } from '../deployment_manager';
 
 import { PoolManagementSimulation } from './pool_management_test';
 import { Simulation, SimulationEnvironment } from './simulation';

contracts/integrations/tslint.json

@@ -4,6 +4,6 @@
         "custom-no-magic-numbers": false
     },
     "linterOptions": {
-        "exclude": ["src/artifacts.ts"]
+        "exclude": ["src/artifacts.ts", "test/artifacts.ts"]
     }
 }

contracts/staking/src/index.ts

@@ -1,4 +1,11 @@
 export * from './wrappers';
 export * from './artifacts';
 export { constants } from './constants';
-export { StakeInfo, StakeStatus } from './types';
+export {
+    GlobalStakeByStatus,
+    OwnerStakeByStatus,
+    StakeInfo,
+    StakingPoolById,
+    StakeStatus,
+    StoredBalance,
+} from './types';