move logger, pseudorandom, wrapper_interfaces to framework/utils/

contracts/integrations/test/deployment_test.ts

@@ -33,7 +33,7 @@ import { AssetProxyId } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import { TxData } from 'ethereum-types';
 
-import { AssetProxyDispatcher, Authorizable, Ownable } from './framework/wrapper_interfaces';
+import { AssetProxyDispatcher, Authorizable, Ownable } from './framework/utils/wrapper_interfaces';
 
 // tslint:disable:no-unnecessary-type-assertion
 blockchainTests('Deployment and Configuration End to End Tests', env => {

contracts/integrations/test/framework/actors/maker.ts

@@ -4,7 +4,7 @@ import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 
 import { AssertionResult } from '../assertions/function_assertion';
 import { validJoinStakingPoolAssertion } from '../assertions/joinStakingPool';
-import { Pseudorandom } from '../pseudorandom';
+import { Pseudorandom } from '../utils/pseudorandom';
 
 import { Actor, ActorConfig, Constructor } from './base';
 

contracts/integrations/test/framework/actors/pool_operator.ts

@@ -6,7 +6,7 @@ import * as _ from 'lodash';
 import { validCreateStakingPoolAssertion } from '../assertions/createStakingPool';
 import { validDecreaseStakingPoolOperatorShareAssertion } from '../assertions/decreaseStakingPoolOperatorShare';
 import { AssertionResult } from '../assertions/function_assertion';
-import { Pseudorandom } from '../pseudorandom';
+import { Pseudorandom } from '../utils/pseudorandom';
 
 import { Actor, Constructor } from './base';
 

contracts/integrations/test/framework/actors/staker.ts

@@ -7,7 +7,7 @@ import { AssertionResult } from '../assertions/function_assertion';
 import { validMoveStakeAssertion } from '../assertions/moveStake';
 import { validStakeAssertion } from '../assertions/stake';
 import { validUnstakeAssertion } from '../assertions/unstake';
-import { Pseudorandom } from '../pseudorandom';
+import { Pseudorandom } from '../utils/pseudorandom';
 
 import { Actor, Constructor } from './base';
 

contracts/integrations/test/framework/actors/taker.ts

@@ -6,7 +6,7 @@ import { TransactionReceiptWithDecodedLogs, TxData } from 'ethereum-types';
 import { validFillOrderCompleteFillAssertion } from '../assertions/fillOrder';
 import { AssertionResult } from '../assertions/function_assertion';
 import { DeploymentManager } from '../deployment_manager';
-import { Pseudorandom } from '../pseudorandom';
+import { Pseudorandom } from '../utils/pseudorandom';
 
 import { Actor, Constructor } from './base';
 

contracts/integrations/test/framework/assertions/function_assertion.ts

@@ -2,7 +2,7 @@ import { BaseContract, ContractFunctionObj, ContractTxFunctionObj } from '@0x/ba
 import { TransactionReceiptWithDecodedLogs, TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { logger } from '../logger';
+import { logger } from '../utils/logger';
 
 // tslint:disable:max-classes-per-file
 export type GenericContractFunction<T> = (...args: any[]) => ContractFunctionObj<T>;

contracts/integrations/test/framework/deployment_manager.ts

@@ -25,7 +25,7 @@ import { BigNumber } from '@0x/utils';
 import { TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { AssetProxyDispatcher, Authorizable, Ownable } from './wrapper_interfaces';
+import { AssetProxyDispatcher, Authorizable, Ownable } from './utils/wrapper_interfaces';
 
 /**
  * Adds a batch of authorities to a list of authorizable contracts.

contracts/integrations/test/framework/simulation.ts

@@ -4,7 +4,7 @@ import { Maker } from './actors/maker';
 import { AssertionResult } from './assertions/function_assertion';
 import { BlockchainBalanceStore } from './balances/blockchain_balance_store';
 import { DeploymentManager } from './deployment_manager';
-import { logger } from './logger';
+import { logger } from './utils/logger';
 
 // tslint:disable:max-classes-per-file
 

contracts/integrations/test/framework/tests/deployment_manager_test.ts

@@ -2,7 +2,7 @@ import { constants as stakingConstants } from '@0x/contracts-staking';
 import { blockchainTests, expect } from '@0x/contracts-test-utils';
 
 import { DeploymentManager } from '../deployment_manager';
-import { Authorizable, Ownable } from '../wrapper_interfaces';
+import { Authorizable, Ownable } from '../utils/wrapper_interfaces';
 
 blockchainTests('Deployment Manager', env => {
     let owner: string;

contracts/integrations/test/framework/utils/logger.ts

@@ -1,6 +1,6 @@
 import { TxData } from 'ethereum-types';
 
-import { Pseudorandom} from './pseudorandom';
+import { Pseudorandom } from '../utils/pseudorandom';
 
 // tslint:disable:no-console
 

contracts/integrations/test/framework/utils/pseudorandom.ts

@@ -22,7 +22,7 @@ class PRNGWrapper {
     /*
      * Pseudorandom version of getRandomPortion/getRandomInteger. If two arguments are provided,
      * treats those arguments as the min and max (inclusive) of the desired range. If only one
-     * argument is provided, picks an integer between 0 and the argument. 
+     * argument is provided, picks an integer between 0 and the argument.
      */
     public integer(max: Numberish): BigNumber;
     public integer(min: Numberish, max: Numberish): BigNumber;

contracts/integrations/test/fuzz_tests/pool_management_test.ts

@@ -5,8 +5,8 @@ import { PoolOperator } from '../framework/actors/pool_operator';
 import { AssertionResult } from '../framework/assertions/function_assertion';
 import { BlockchainBalanceStore } from '../framework/balances/blockchain_balance_store';
 import { DeploymentManager } from '../framework/deployment_manager';
-import { Pseudorandom } from '../framework/pseudorandom';
 import { Simulation, SimulationEnvironment } from '../framework/simulation';
+import { Pseudorandom } from '../framework/utils/pseudorandom';
 
 export class PoolManagementSimulation extends Simulation {
     protected async *_assertionGenerator(): AsyncIterableIterator<AssertionResult | void> {

contracts/integrations/test/fuzz_tests/pool_membership_test.ts

@@ -5,8 +5,8 @@ import { Maker } from '../framework/actors/maker';
 import { AssertionResult } from '../framework/assertions/function_assertion';
 import { BlockchainBalanceStore } from '../framework/balances/blockchain_balance_store';
 import { DeploymentManager } from '../framework/deployment_manager';
-import { Pseudorandom } from '../framework/pseudorandom';
 import { Simulation, SimulationEnvironment } from '../framework/simulation';
+import { Pseudorandom } from '../framework/utils/pseudorandom';
 
 import { PoolManagementSimulation } from './pool_management_test';
 

contracts/integrations/test/fuzz_tests/stake_management_test.ts

@@ -5,8 +5,8 @@ import { Staker } from '../framework/actors/staker';
 import { AssertionResult } from '../framework/assertions/function_assertion';
 import { BlockchainBalanceStore } from '../framework/balances/blockchain_balance_store';
 import { DeploymentManager } from '../framework/deployment_manager';
-import { Pseudorandom } from '../framework/pseudorandom';
 import { Simulation, SimulationEnvironment } from '../framework/simulation';
+import { Pseudorandom } from '../framework/utils/pseudorandom';
 
 import { PoolManagementSimulation } from './pool_management_test';