Update imports to match private package more

package.json

@@ -16,8 +16,9 @@
     "scripts": {
         "prod": "yarn run build",
         "chain": "bash scripts/init_chain_internal.sh",
-        "build": "yarn run build-ts && yarn run tslint && tspath -f",
+        "build": "yarn run build-dist && yarn run tslint && tspath -f",
         "build-ts": "tsc -p tsconfig.json",
+        "build-dist": "tsc -p tsconfig.dist.json",
         "test": "jest --runInBand",
         "test:watch": "jest --watch --runInBand",
         "tslint": "tslint -c tslint.json -p tsconfig.json",

src/api/ERC20API.ts

@@ -21,8 +21,8 @@ import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber } from 'ethers/utils';
 import { Provider } from 'ethers/providers';
 
-import ERC20Wrapper from '@src/wrappers/set-protocol-v2/ERC20Wrapper';
-import Assertions from '@src/assertions';
+import ERC20Wrapper from '../wrappers/set-protocol-v2/ERC20Wrapper';
+import Assertions from '../assertions';
 
 /**
  * @title  ERC20Wrapper

src/api/FeeAPI.ts

@@ -22,9 +22,9 @@ import { Address } from 'set-protocol-v2/utils/types';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber } from 'ethers/utils';
 
-import StreamingFeeModuleWrapper from '@src/wrappers/set-protocol-v2/StreamingFeeModuleWrapper';
-import Assertions from '@src/assertions';
-import ProtocolViewerWrapper from '@src/wrappers/set-protocol-v2/ProtocolViewerWrapper';
+import StreamingFeeModuleWrapper from '../wrappers/set-protocol-v2/StreamingFeeModuleWrapper';
+import Assertions from '../assertions';
+import ProtocolViewerWrapper from '../wrappers/set-protocol-v2/ProtocolViewerWrapper';
 import { StreamingFeeInfo } from '../types';
 
 /**
@@ -61,7 +61,7 @@ export default class FeeAPI {
    * @param  tokenAddresses    Addresses of ERC20 contracts to check balance for
    * @returns                  Array of streaming fee infos
    */
-  public async batchFetchStreamingFeeInfo(
+  public async batchFetchStreamingFeeInfoAsync(
     tokenAddresses: Address[],
   ): Promise<StreamingFeeInfo[]> {
     return await this.protocolViewerWrapper.batchFetchStreamingFeeInfo(tokenAddresses);

src/api/IssuanceAPI.ts

@@ -22,8 +22,8 @@ import { Address } from 'set-protocol-v2/utils/types';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber } from 'ethers/utils';
 
-import BasicIssuanceModuleWrapper from '@src/wrappers/set-protocol-v2/BasicIssuanceModuleWrapper';
-import Assertions from '@src/assertions';
+import BasicIssuanceModuleWrapper from '../wrappers/set-protocol-v2/BasicIssuanceModuleWrapper';
+import Assertions from '../assertions';
 
 /**
  * @title  IssuanceAPI

src/api/NavIssuanceAPI.ts

@@ -22,8 +22,8 @@ import { Address } from 'set-protocol-v2/utils/types';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber } from 'ethers/utils';
 
-import NavIssuanceModuleWrapper from '@src/wrappers/set-protocol-v2/NavIssuanceModuleWrapper';
-import Assertions from '@src/assertions';
+import NavIssuanceModuleWrapper from '../wrappers/set-protocol-v2/NavIssuanceModuleWrapper';
+import Assertions from '../assertions';
 
 /**
  * @title  NavIssuanceAPI

src/api/PriceOracleAPI.ts

@@ -20,8 +20,8 @@ import { Provider } from 'ethers/providers';
 import { Address } from 'set-protocol-v2/utils/types';
 import { BigNumber } from 'ethers/utils';
 
-import PriceOracleWrapper from '../../src/wrappers/set-protocol-v2/PriceOracleWrapper';
-import Assertions from '../../src/assertions';
+import PriceOracleWrapper from '../wrappers/set-protocol-v2/PriceOracleWrapper';
+import Assertions from '../assertions';
 
 /**
  * @title  PriceOracleAPI

src/api/SetTokenAPI.ts

@@ -21,10 +21,10 @@ import { Provider } from 'ethers/providers';
 import { Address, Position } from 'set-protocol-v2/utils/types';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 
-import SetTokenWrapper from '@src/wrappers/set-protocol-v2/SetTokenWrapper';
-import Assertions from '@src/assertions';
-import { ModuleState } from '@src/types';
-import ProtocolViewerWrapper from '@src/wrappers/set-protocol-v2/ProtocolViewerWrapper';
+import SetTokenWrapper from '../wrappers/set-protocol-v2/SetTokenWrapper';
+import Assertions from '../assertions';
+import { ModuleState } from '../types';
+import ProtocolViewerWrapper from '../wrappers/set-protocol-v2/ProtocolViewerWrapper';
 
 /**
  * @title  SetTokenWrapper
@@ -59,7 +59,7 @@ export default class SetTokenAPI {
    * @param  tokenAddresses Addresses of ERC20 contracts to check balance for
    * @returns               Addresses of managers of the set tokens
    */
-  public async batchFetchManagers(
+  public async batchFetchManagersAsync(
     tokenAddresses: Address[],
   ): Promise<Address[]> {
     return await this.protocolViewerWrapper.batchFetchManagers(tokenAddresses);

src/api/SystemAPI.ts

@@ -19,7 +19,7 @@
 import { Provider } from 'ethers/providers';
 import { Address } from 'set-protocol-v2/utils/types';
 
-import ControllerWrapper from '@src/wrappers/set-protocol-v2/ControllerWrapper';
+import ControllerWrapper from '../wrappers/set-protocol-v2/ControllerWrapper';
 
 /**
  * @title  SystemAPI

src/api/TradeAPI.ts

@@ -22,8 +22,8 @@ import { Address } from 'set-protocol-v2/utils/types';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber, Arrayish } from 'ethers/utils';
 
-import TradeModuleWrapper from '@src/wrappers/set-protocol-v2/TradeModuleWrapper';
-import Assertions from '@src/assertions';
+import TradeModuleWrapper from '../wrappers/set-protocol-v2/TradeModuleWrapper';
+import Assertions from '../assertions';
 
 /**
  * @title  TradeAPI

src/index.ts

@@ -3,6 +3,6 @@ export { BigNumber } from 'ethers/utils';
 export {
   SetJSConfig,
   ModuleState,
-} from '@src/types/index';
+} from './types/index';
 
 export default Set;

src/wrappers/set-protocol-v2/BasicIssuanceModuleWrapper.ts

@@ -13,12 +13,12 @@
 
 'use strict';
 
-import { Address } from 'set-protocol-v2/utils/types';
+import { Address } from 'set-protocol-v2/dist/utils/types';
 import { ContractTransaction } from 'ethers';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber } from 'ethers/utils';
 import { Provider } from 'ethers/providers';
-import { generateTxOpts } from '@src/utils/transactions';
+import { generateTxOpts } from '../../utils/transactions';
 
 import ContractWrapper from './ContractWrapper';
 

src/wrappers/set-protocol-v2/ContractWrapper.ts

@@ -29,7 +29,6 @@ import {
   SetTokenCreator,
   StreamingFeeModule,
   TradeModule,
-  OneInchExchangeAdapter,
   NavIssuanceModule,
   PriceOracle,
 } from 'set-protocol-v2/dist/utils/contracts';
@@ -41,7 +40,6 @@ import { SetTokenFactory } from 'set-protocol-v2/dist/typechain/SetTokenFactory'
 import { SetTokenCreatorFactory } from 'set-protocol-v2/dist/typechain/SetTokenCreatorFactory';
 import { StreamingFeeModuleFactory } from 'set-protocol-v2/dist/typechain/StreamingFeeModuleFactory';
 import { TradeModuleFactory } from 'set-protocol-v2/dist/typechain/TradeModuleFactory';
-import { OneInchExchangeAdapterFactory } from 'set-protocol-v2/dist/typechain/OneInchExchangeAdapterFactory';
 import { NavIssuanceModuleFactory } from 'set-protocol-v2/dist/typechain/NavIssuanceModuleFactory';
 import { PriceOracleFactory } from 'set-protocol-v2/dist/typechain/PriceOracleFactory';
 
@@ -222,33 +220,6 @@ export default class ContractWrapper {
     }
   }
 
-  /**
-   * Load OneInchExchangeAdapter contract
-   *
-   * @param  oneInchExchangeAdapterAddress  Address of the one inch exchange adapter
-   * @param  callerAddress                  Address of caller, uses first one on node if none provided.
-   * @return                                OneInchExchangeAdapter contract instance
-   */
-  public async loadOneInchExchangeAdapterAsync(
-    oneInchExchangeAdapterAddress: Address,
-    callerAddress?: Address,
-  ): OneInchExchangeAdapter {
-    const signer = (this.provider as JsonRpcProvider).getSigner(callerAddress);
-    const cacheKey = `OneInchExchangeAdapter_${oneInchExchangeAdapterAddress}_${await signer.getAddress()}`;
-
-    if (cacheKey in this.cache) {
-      return this.cache[cacheKey] as OneInchExchangeAdapter;
-    } else {
-      const oneInchExchangeAdapterContract = OneInchExchangeAdapterFactory.connect(
-        oneInchExchangeAdapterAddress,
-        signer
-      );
-
-      this.cache[cacheKey] = oneInchExchangeAdapterContract;
-      return oneInchExchangeAdapterContract;
-    }
-  }
-
   /**
    * Load Set Token contract
    *

src/wrappers/set-protocol-v2/ERC20Wrapper.ts

@@ -21,7 +21,7 @@ import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber } from 'ethers/utils';
 import { Provider } from 'ethers/providers';
 
-import { generateTxOpts } from '@src/utils/transactions';
+import { generateTxOpts } from '../../utils/transactions';
 import ContractWrapper from './ContractWrapper';
 
 /**

src/wrappers/set-protocol-v2/NavIssuanceModuleWrapper.ts

@@ -18,7 +18,7 @@ import { ContractTransaction } from 'ethers';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber, BigNumberish } from 'ethers/utils';
 import { Provider } from 'ethers/providers';
-import { generateTxOpts } from '@src/utils/transactions';
+import { generateTxOpts } from '../../utils/transactions';
 
 import ContractWrapper from './ContractWrapper';
 

src/wrappers/set-protocol-v2/ProtocolViewerWrapper.ts

@@ -20,7 +20,7 @@ import { Provider, JsonRpcProvider } from 'ethers/providers';
 import { Address } from 'set-protocol-v2/utils/types';
 
 import ContractWrapper from './ContractWrapper';
-import { StreamingFeeInfo } from '@src/types';
+import { StreamingFeeInfo } from '../../types';
 
 /**
  * @title ProtocolViewerWrapper

src/wrappers/set-protocol-v2/SetTokenWrapper.ts

@@ -22,7 +22,7 @@ import { Address, Position } from 'set-protocol-v2/utils/types';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 
 import ContractWrapper from './ContractWrapper';
-import { generateTxOpts } from '@src/utils/transactions';
+import { generateTxOpts } from '../../utils/transactions';
 
 /**
  * @title  SetTokenWrapper

src/wrappers/set-protocol-v2/StreamingFeeModuleWrapper.ts

@@ -18,7 +18,7 @@ import { ContractTransaction } from 'ethers';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber } from 'ethers/utils';
 import { Provider } from 'ethers/providers';
-import { generateTxOpts } from '@src/utils/transactions';
+import { generateTxOpts } from '../../utils/transactions';
 
 import ContractWrapper from './ContractWrapper';
 

src/wrappers/set-protocol-v2/TradeModuleWrapper.ts

@@ -18,7 +18,7 @@ import { ContractTransaction } from 'ethers';
 import { TransactionOverrides } from 'set-protocol-v2/dist/typechain';
 import { BigNumber, Arrayish } from 'ethers/utils';
 import { Provider } from 'ethers/providers';
-import { generateTxOpts } from '@src/utils/transactions';
+import { generateTxOpts } from '../../utils/transactions';
 
 import ContractWrapper from './ContractWrapper';
 

test/api/FeeAPI.spec.ts

@@ -53,7 +53,7 @@ describe('FeeAPI', () => {
     (ProtocolViewerWrapper as any).mockClear();
   });
 
-  describe('#batchFetchStreamingFeeInfo', () => {
+  describe('#batchFetchStreamingFeeInfoAsync', () => {
     let subjectSetTokenAddress1: Address;
     let subjectSetTokenAddress2: Address;
 
@@ -63,7 +63,7 @@ describe('FeeAPI', () => {
     });
 
     async function subject(): Promise<StreamingFeeInfo[]> {
-      return await feeAPI.batchFetchStreamingFeeInfo(
+      return await feeAPI.batchFetchStreamingFeeInfoAsync(
         [subjectSetTokenAddress1, subjectSetTokenAddress2]
       );
     }

test/api/SetTokenAPI.spec.ts

@@ -51,7 +51,7 @@ describe('SetTokenAPI', () => {
     (ProtocolViewerWrapper as any).mockClear();
   });
 
-  describe('#batchFetchManagers', () => {
+  describe('#batchFetchManagersAsync', () => {
     let subjectSetTokenAddress1: Address;
     let subjectSetTokenAddress2: Address;
     let setTokenAddresses: Address[];
@@ -63,7 +63,7 @@ describe('SetTokenAPI', () => {
     });
 
     async function subject(): Promise<Address[]> {
-      return await setTokenAPI.batchFetchManagers(setTokenAddresses);
+      return await setTokenAPI.batchFetchManagersAsync(setTokenAddresses);
     }
 
     it('should call the ProtocolViewerWrapper with correct params', async () => {

tsconfig.dist.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": [
+    "test/**/*.ts"
+  ]
+}

tsconfig.json

@@ -10,8 +10,8 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "resolveJsonModule": true,
-    // "declaration": true,
-    // "declarationDir": "./dist/types",
+    "declaration": true,
+    "declarationDir": "./dist/types",
     "paths": {
       "@src/*": [ "src/*" ],
       "@test/*": [ "test/*" ]