Implement liquidity checking w/ testing

2019-01-08 08:57:36 -08:00
parent 2111ea159e
commit a9fad77eb4
6 changed files with 321 additions and 48 deletions
--- a/packages/asset-buyer/package.json
+++ b/packages/asset-buyer/package.json
@@ -65,6 +65,7 @@
        "shx": "^0.2.2",
        "tslint": "5.11.0",
        "typedoc": "0.13.0",
+        "typemoq": "^2.1.0",
        "typescript": "3.0.1"
    },
    "publishConfig": {
--- a/packages/asset-buyer/src/asset_buyer.ts
+++ b/packages/asset-buyer/src/asset_buyer.ts
@@ -16,6 +16,7 @@ import {
    BuyQuote,
    BuyQuoteExecutionOpts,
    BuyQuoteRequestOpts,
+    LiquidityForAssetData,
    OrderProvider,
    OrderProviderResponse,
    OrdersAndFillableAmounts,
@@ -25,12 +26,42 @@ import { assert } from './utils/assert';
 import { assetDataUtils } from './utils/asset_data_utils';
 import { buyQuoteCalculator } from './utils/buy_quote_calculator';
 import { orderProviderResponseProcessor } from './utils/order_provider_response_processor';
+import { orderUtils } from './utils/order_utils';

 interface OrdersEntry {
    ordersAndFillableAmounts: OrdersAndFillableAmounts;
    lastRefreshTime: number;
 }

+const calculateLiquidity = (ordersAndFillableAmounts: OrdersAndFillableAmounts): LiquidityForAssetData => {
+    const { orders, remainingFillableMakerAssetAmounts } = ordersAndFillableAmounts;
+    const liquidityInBigNumbers = orders.reduce(
+        (acc, order, curIndex) => {
+            const availableMakerAssetAmount = remainingFillableMakerAssetAmounts[curIndex];
+            if (availableMakerAssetAmount === undefined) {
+                throw new Error(`No corresponding fillableMakerAssetAmounts at index ${curIndex}`);
+            }
+
+            const tokensAvailableForCurrentOrder = availableMakerAssetAmount;
+            const ethValueAvailableForCurrentOrder = orderUtils.getTakerFillAmount(order, availableMakerAssetAmount);
+            return {
+                tokensAvailableInUnitAmount: acc.tokensAvailableInUnitAmount.plus(tokensAvailableForCurrentOrder),
+                ethValueAvailableInWei: acc.ethValueAvailableInWei.plus(ethValueAvailableForCurrentOrder),
+            };
+        },
+        {
+            tokensAvailableInUnitAmount: new BigNumber(0),
+            ethValueAvailableInWei: new BigNumber(0),
+        },
+    );
+
+    // Turn into regular numbers
+    return {
+        tokensAvailableInUnitAmount: liquidityInBigNumbers.tokensAvailableInUnitAmount.toNumber(),
+        ethValueAvailableInWei: liquidityInBigNumbers.ethValueAvailableInWei.toNumber(),
+    };
+};
+
 export class AssetBuyer {
    public readonly provider: Provider;
    public readonly orderProvider: OrderProvider;
@@ -138,10 +169,10 @@ export class AssetBuyer {
        // get the relevant orders for the makerAsset and fees
        // if the requested assetData is ZRX, don't get the fee info
        const [ordersAndFillableAmounts, feeOrdersAndFillableAmounts] = await Promise.all([
-            this._getOrdersAndFillableAmountsAsync(assetData, shouldForceOrderRefresh),
+            this.getOrdersAndFillableAmountsAsync(assetData, shouldForceOrderRefresh),
            isMakerAssetZrxToken
                ? Promise.resolve(constants.EMPTY_ORDERS_AND_FILLABLE_AMOUNTS)
-                : this._getOrdersAndFillableAmountsAsync(zrxTokenAssetData, shouldForceOrderRefresh),
+                : this.getOrdersAndFillableAmountsAsync(zrxTokenAssetData, shouldForceOrderRefresh),
            shouldForceOrderRefresh,
        ]);
        if (ordersAndFillableAmounts.orders.length === 0) {
@@ -177,6 +208,36 @@ export class AssetBuyer {
        const buyQuote = this.getBuyQuoteAsync(assetData, assetBuyAmount, options);
        return buyQuote;
    }
+    public async getLiquidityForAssetDataAsync(
+        assetData: string,
+        options: Partial<BuyQuoteRequestOpts> = {},
+    ): Promise<LiquidityForAssetData> {
+        const { feePercentage, shouldForceOrderRefresh, slippagePercentage } = _.merge(
+            {},
+            constants.DEFAULT_BUY_QUOTE_REQUEST_OPTS,
+            options,
+        );
+        assert.isString('assetData', assetData);
+        assert.isValidPercentage('feePercentage', feePercentage);
+        assert.isBoolean('shouldForceOrderRefresh', shouldForceOrderRefresh);
+        assert.isNumber('slippagePercentage', slippagePercentage);
+
+        const assetPairs = await this.orderProvider.getAvailableMakerAssetDatasAsync(assetData);
+        if (!assetPairs.includes(assetData)) {
+            return {
+                tokensAvailableInUnitAmount: 0,
+                ethValueAvailableInWei: 0,
+            };
+        }
+
+        const ordersAndFillableAmounts = await this.getOrdersAndFillableAmountsAsync(
+            assetData,
+            shouldForceOrderRefresh,
+        );
+
+        return calculateLiquidity(ordersAndFillableAmounts);
+    }
+
    /**
     * Given a BuyQuote and desired rate, attempt to execute the buy.
     * @param   buyQuote        An object that conforms to BuyQuote. See type definition for more information.
@@ -261,7 +322,7 @@ export class AssetBuyer {
    /**
     * Grab orders from the map, if there is a miss or it is time to refresh, fetch and process the orders
     */
-    private async _getOrdersAndFillableAmountsAsync(
+    public async getOrdersAndFillableAmountsAsync(
        assetData: string,
        shouldForceOrderRefresh: boolean,
    ): Promise<OrdersAndFillableAmounts> {
--- a/packages/asset-buyer/src/types.ts
+++ b/packages/asset-buyer/src/types.ts
@@ -121,3 +121,11 @@ export interface OrdersAndFillableAmounts {
    orders: SignedOrder[];
    remainingFillableMakerAssetAmounts: BigNumber[];
 }
+
+/**
+ * Represents available liquidity for a given assetData
+ */
+export interface LiquidityForAssetData {
+    tokensAvailableInUnitAmount: number;
+    ethValueAvailableInWei: number;
+}
--- a/packages/asset-buyer/test/asset_buyer_test.ts
+++ b/packages/asset-buyer/test/asset_buyer_test.ts
@@ -0,0 +1,168 @@
+import { orderFactory } from '@0x/order-utils/lib/src/order_factory';
+import { Web3ProviderEngine } from '@0x/subproviders';
+import { SignedOrder } from '@0x/types';
+import { BigNumber } from '@0x/utils';
+import { Web3Wrapper } from '@0x/web3-wrapper';
+import * as chai from 'chai';
+import 'mocha';
+import * as TypeMoq from 'typemoq';
+
+import { AssetBuyer } from '../src';
+import { constants } from '../src/constants';
+import { LiquidityForAssetData, OrderProvider, OrdersAndFillableAmounts } from '../src/types';
+
+import { chaiSetup } from './utils/chai_setup';
+import {
+    mockAvailableAssetDatas,
+    mockedAssetBuyerWithOrdersAndFillableAmounts,
+    orderProviderMock,
+} from './utils/mocks';
+
+chaiSetup.configure();
+const expect = chai.expect;
+
+const FAKE_SRA_URL = 'https://fakeurl.com';
+const FAKE_ASSET_DATA = '0xf47261b00000000000000000000000001dc4c1cefef38a777b15aa20260a54e584b16c48';
+const TOKEN_DECIMALS = 18;
+const WETH_DECIMALS = constants.ETHER_TOKEN_DECIMALS;
+
+const baseUnitAmount = (unitAmount: number, decimals = TOKEN_DECIMALS): BigNumber => {
+    return Web3Wrapper.toBaseUnitAmount(new BigNumber(unitAmount), decimals);
+};
+
+const expectLiquidityResult = async (
+    web3Provider: Web3ProviderEngine,
+    orderProvider: OrderProvider,
+    ordersAndFillableAmounts: OrdersAndFillableAmounts,
+    expectedLiquidityResult: LiquidityForAssetData,
+) => {
+    const mockedAssetBuyer = mockedAssetBuyerWithOrdersAndFillableAmounts(
+        web3Provider,
+        orderProvider,
+        FAKE_ASSET_DATA,
+        ordersAndFillableAmounts,
+    );
+    const liquidityResult = await mockedAssetBuyer.object.getLiquidityForAssetDataAsync(FAKE_ASSET_DATA);
+    expect(liquidityResult).to.deep.equal(expectedLiquidityResult);
+};
+
+describe('AssetBuyer', () => {
+    describe('getLiquidityForAssetDataAsync', () => {
+        const mockWeb3Provider = TypeMoq.Mock.ofType(Web3ProviderEngine);
+        const mockOrderProvider = orderProviderMock();
+
+        beforeEach(() => {
+            mockWeb3Provider.reset();
+            mockOrderProvider.reset();
+        });
+
+        afterEach(() => {
+            mockWeb3Provider.verifyAll();
+            mockOrderProvider.verifyAll();
+        });
+
+        describe('validation', () => {
+            it('should ensure assetData is a string', async () => {
+                const assetBuyer = AssetBuyer.getAssetBuyerForStandardRelayerAPIUrl(
+                    mockWeb3Provider.object,
+                    FAKE_SRA_URL,
+                );
+
+                expect(assetBuyer.getLiquidityForAssetDataAsync(false as any)).to.be.rejectedWith(
+                    'Expected assetData to be of type string, encountered: false',
+                );
+            });
+        });
+
+        it('should return 0s when asset pair not supported', async () => {
+            mockAvailableAssetDatas(mockOrderProvider, FAKE_ASSET_DATA, []);
+
+            const assetBuyer = new AssetBuyer(mockWeb3Provider.object, mockOrderProvider.object);
+            const liquidityResult = await assetBuyer.getLiquidityForAssetDataAsync(FAKE_ASSET_DATA);
+            expect(liquidityResult).to.deep.equal({
+                tokensAvailableInUnitAmount: 0,
+                ethValueAvailableInWei: 0,
+            });
+        });
+
+        describe('assetData is supported', () => {
+            // orders
+            const sellTwoTokensFor1Weth: SignedOrder = orderFactory.createSignedOrderFromPartial({
+                makerAssetAmount: baseUnitAmount(2),
+                takerAssetAmount: baseUnitAmount(1, WETH_DECIMALS),
+            });
+            const sellTenTokensFor10Weth: SignedOrder = orderFactory.createSignedOrderFromPartial({
+                // tslint:disable-next-line:custom-no-magic-numbers
+                makerAssetAmount: baseUnitAmount(10),
+                // tslint:disable-next-line:custom-no-magic-numbers
+                takerAssetAmount: baseUnitAmount(10, WETH_DECIMALS),
+            });
+
+            beforeEach(() => {
+                mockAvailableAssetDatas(mockOrderProvider, FAKE_ASSET_DATA, [FAKE_ASSET_DATA]);
+            });
+
+            it('should return 0s when no orders available', async () => {
+                const ordersAndFillableAmounts: OrdersAndFillableAmounts = {
+                    orders: [],
+                    remainingFillableMakerAssetAmounts: [],
+                };
+                const mockedAssetBuyer = mockedAssetBuyerWithOrdersAndFillableAmounts(
+                    mockWeb3Provider.object,
+                    mockOrderProvider.object,
+                    FAKE_ASSET_DATA,
+                    ordersAndFillableAmounts,
+                );
+
+                const liquidityResult = await mockedAssetBuyer.object.getLiquidityForAssetDataAsync(FAKE_ASSET_DATA);
+                expect(liquidityResult).to.deep.equal({
+                    tokensAvailableInUnitAmount: 0,
+                    ethValueAvailableInWei: 0,
+                });
+            });
+
+            it('should return correct computed value when orders provided with full fillableAmounts', async () => {
+                const orders: SignedOrder[] = [sellTwoTokensFor1Weth, sellTenTokensFor10Weth];
+                const remainingFillableMakerAssetAmounts: BigNumber[] = orders.map(o => o.makerAssetAmount);
+                const mockedAssetBuyer = mockedAssetBuyerWithOrdersAndFillableAmounts(
+                    mockWeb3Provider.object,
+                    mockOrderProvider.object,
+                    FAKE_ASSET_DATA,
+                    {
+                        orders,
+                        remainingFillableMakerAssetAmounts,
+                    },
+                );
+
+                const expectedTokensAvailable = orders[0].makerAssetAmount.plus(orders[1].makerAssetAmount);
+                const expectedEthValueAvailable = orders[0].takerAssetAmount.plus(orders[1].takerAssetAmount);
+
+                const liquidityResult = await mockedAssetBuyer.object.getLiquidityForAssetDataAsync(FAKE_ASSET_DATA);
+                expect(liquidityResult).to.deep.equal({
+                    tokensAvailableInUnitAmount: expectedTokensAvailable.toNumber(),
+                    ethValueAvailableInWei: expectedEthValueAvailable.toNumber(),
+                });
+            });
+
+            it('should return correct computed value with one partial fillableAmounts', async () => {
+                const ordersAndFillableAmounts = {
+                    orders: [sellTwoTokensFor1Weth],
+                    remainingFillableMakerAssetAmounts: [baseUnitAmount(1)],
+                };
+
+                const expectedResult = {
+                    tokensAvailableInUnitAmount: baseUnitAmount(1).toNumber(),
+                    // tslint:disable-next-line:custom-no-magic-numbers
+                    ethValueAvailableInWei: baseUnitAmount(0.5, WETH_DECIMALS).toNumber(),
+                };
+
+                await expectLiquidityResult(
+                    mockWeb3Provider.object,
+                    mockOrderProvider.object,
+                    ordersAndFillableAmounts,
+                    expectedResult,
+                );
+            });
+        });
+    });
+});
--- a/packages/asset-buyer/test/utils/mocks.ts
+++ b/packages/asset-buyer/test/utils/mocks.ts
@@ -0,0 +1,66 @@
+import { Web3ProviderEngine } from '@0x/subproviders';
+import * as TypeMoq from 'typemoq';
+
+import { AssetBuyer } from '../../src/asset_buyer';
+import { OrderProvider, OrderProviderResponse, OrdersAndFillableAmounts } from '../../src/types';
+
+// Implementing dummy class for using in mocks, see https://github.com/florinn/typemoq/issues/3
+class OrderProviderClass implements OrderProvider {
+    // tslint:disable-next-line:prefer-function-over-method
+    public async getOrdersAsync(): Promise<OrderProviderResponse> {
+        return Promise.resolve({ orders: [] });
+    }
+    // tslint:disable-next-line:prefer-function-over-method
+    public async getAvailableMakerAssetDatasAsync(takerAssetData: string): Promise<string[]> {
+        return Promise.resolve([]);
+    }
+}
+
+export const orderProviderMock = () => {
+    return TypeMoq.Mock.ofType(OrderProviderClass, TypeMoq.MockBehavior.Strict);
+};
+
+export const mockAvailableAssetDatas = (
+    mockOrderProvider: TypeMoq.IMock<OrderProviderClass>,
+    assetData: string,
+    availableAssetDatas: string[],
+) => {
+    mockOrderProvider
+        .setup(op => op.getAvailableMakerAssetDatasAsync(TypeMoq.It.isValue(assetData)))
+        .returns(() => {
+            return Promise.resolve(availableAssetDatas);
+        })
+        .verifiable(TypeMoq.Times.once());
+};
+
+const partiallyMockedAssetBuyer = (
+    provider: Web3ProviderEngine,
+    orderProvider: OrderProvider,
+): TypeMoq.IMock<AssetBuyer> => {
+    const rawAssetBuyer = new AssetBuyer(provider, orderProvider);
+    const mockedAssetBuyer = TypeMoq.Mock.ofInstance(rawAssetBuyer, TypeMoq.MockBehavior.Loose, false);
+    mockedAssetBuyer.callBase = true;
+    return mockedAssetBuyer;
+};
+
+const mockGetOrdersAndAvailableAmounts = (
+    mockedAssetBuyer: TypeMoq.IMock<AssetBuyer>,
+    assetData: string,
+    ordersAndFillableAmounts: OrdersAndFillableAmounts,
+): void => {
+    mockedAssetBuyer
+        .setup(a => a.getOrdersAndFillableAmountsAsync(assetData, false))
+        .returns(() => Promise.resolve(ordersAndFillableAmounts))
+        .verifiable(TypeMoq.Times.once());
+};
+
+export const mockedAssetBuyerWithOrdersAndFillableAmounts = (
+    provider: Web3ProviderEngine,
+    orderProvider: OrderProvider,
+    assetData: string,
+    ordersAndFillableAmounts: OrdersAndFillableAmounts,
+): TypeMoq.IMock<AssetBuyer> => {
+    const mockedAssetBuyer = partiallyMockedAssetBuyer(provider, orderProvider);
+    mockGetOrdersAndAvailableAmounts(mockedAssetBuyer, assetData, ordersAndFillableAmounts);
+    return mockedAssetBuyer;
+};
--- a/yarn.lock
+++ b/yarn.lock
@@ -1302,7 +1302,6 @@
 "@types/chokidar@^1.7.5":
  version "1.7.5"
  resolved "https://registry.yarnpkg.com/@types/chokidar/-/chokidar-1.7.5.tgz#1fa78c8803e035bed6d98e6949e514b133b0c9b6"
-  integrity sha512-PDkSRY7KltW3M60hSBlerxI8SFPXsO3AL/aRVsO4Kh9IHRW74Ih75gUuTd/aE4LSSFqypb10UIX3QzOJwBQMGQ==
  dependencies:
    "@types/events" "*"
    "@types/node" "*"
@@ -1561,7 +1560,6 @@
 "@types/pluralize@^0.0.29":
  version "0.0.29"
  resolved "https://registry.yarnpkg.com/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c"
-  integrity sha512-BYOID+l2Aco2nBik+iYS4SZX0Lf20KPILP5RGmM1IgzdwNdTs0eebiFriOPcej1sX9mLnSoiNte5zcFxssgpGA==

 "@types/prop-types@*":
  version "15.5.5"
@@ -2100,10 +2098,6 @@ aes-js@^0.2.3:
  version "0.2.4"
  resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-0.2.4.tgz#94b881ab717286d015fa219e08fb66709dda5a3d"

-aes-js@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a"
-
 agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
  version "4.2.1"
  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -3669,7 +3663,7 @@ bs-logger@0.x:
  dependencies:
    fast-json-stable-stringify "^2.0.0"

-bs58@=4.0.1, bs58@^4.0.0:
+bs58@=4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
  dependencies:
@@ -3692,14 +3686,6 @@ bs58check@^1.0.8:
    bs58 "^3.1.0"
    create-hash "^1.1.0"

-bs58check@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
-  dependencies:
-    bs58 "^4.0.0"
-    create-hash "^1.1.0"
-    safe-buffer "^5.1.2"
-
 bser@^2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -4165,7 +4151,6 @@ chokidar@^2.0.0, chokidar@^2.0.2:
 chokidar@^2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
  dependencies:
    anymatch "^2.0.0"
    async-each "^1.0.0"
@@ -6410,19 +6395,6 @@ ethereumjs-wallet@0.6.0:
    utf8 "^2.1.1"
    uuid "^2.0.1"

-ethereumjs-wallet@~0.6.0:
-  version "0.6.2"
-  resolved "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda"
-  dependencies:
-    aes-js "^3.1.1"
-    bs58check "^2.1.2"
-    ethereumjs-util "^5.2.0"
-    hdkey "^1.0.0"
-    safe-buffer "^5.1.2"
-    scrypt.js "^0.2.0"
-    utf8 "^3.0.0"
-    uuid "^3.3.2"
-
 ethers@~4.0.4:
  version "4.0.4"
  resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.4.tgz#d3f85e8b27f4b59537e06526439b0fb15b44dc65"
@@ -7339,7 +7311,7 @@ ganache-core@0xProject/ganache-core#monorepo-dep:
    ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default"
    ethereumjs-util "^5.2.0"
    ethereumjs-vm "2.3.5"
-    ethereumjs-wallet "~0.6.0"
+    ethereumjs-wallet "0.6.0"
    fake-merkle-patricia-tree "~1.0.1"
    heap "~0.2.6"
    js-scrypt "^0.2.0"
@@ -8077,14 +8049,6 @@ hdkey@^0.7.0, hdkey@^0.7.1:
    coinstring "^2.0.0"
    secp256k1 "^3.0.1"

-hdkey@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/hdkey/-/hdkey-1.1.0.tgz#e74e7b01d2c47f797fa65d1d839adb7a44639f29"
-  dependencies:
-    coinstring "^2.0.0"
-    safe-buffer "^5.1.1"
-    secp256k1 "^3.0.1"
-
 he@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -10233,7 +10197,6 @@ lodash.camelcase@^3.0.1:
 lodash.debounce@^4.0.8:
  version "4.0.8"
  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=

 lodash.deburr@^3.0.0:
  version "3.2.0"
@@ -12364,7 +12327,6 @@ pkginfo@0.x.x:
 pluralize@^7.0.0:
  version "7.0.0"
  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==

 pn@^1.1.0:
  version "1.1.0"
@@ -12664,6 +12626,10 @@ postgres-interval@^1.1.0:
  dependencies:
    xtend "^4.0.0"

+postinstall-build@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postinstall-build/-/postinstall-build-5.0.3.tgz#238692f712a481d8f5bc8960e94786036241efc7"
+
 prebuild-install@^2.2.2:
  version "2.5.3"
  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.3.tgz#9f65f242782d370296353710e9bc843490c19f69"
@@ -16295,6 +16261,14 @@ typedoc@0.13.0:
    typedoc-default-themes "^0.5.0"
    typescript "3.1.x"

+typemoq@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/typemoq/-/typemoq-2.1.0.tgz#4452ce360d92cf2a1a180f0c29de2803f87af1e8"
+  dependencies:
+    circular-json "^0.3.1"
+    lodash "^4.17.4"
+    postinstall-build "^5.0.1"
+
 typeorm@^0.2.7:
  version "0.2.7"
  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.7.tgz#4bbbace80dc91b1303be13f42d44ebf01d1b2558"
@@ -16576,7 +16550,6 @@ upath@^1.0.0:
 upath@^1.0.5:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==

 update-notifier@^2.3.0, update-notifier@^2.5.0:
  version "2.5.0"
@@ -16679,10 +16652,6 @@ utf8@^2.1.1:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"

-utf8@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1"
-
 util-deprecate@~1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"