From 539c243733c60fe083ed0e3e7d7663981f5d7663 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 4 Sep 2018 16:23:02 +0100
Subject: Move fetchers to contract-wrappers

---
 .../asset_balance_and_proxy_allowance_fetcher.ts   | 74 ----------------------
 .../src/fetchers/order_filled_cancelled_fetcher.ts | 27 --------
 2 files changed, 101 deletions(-)
 delete mode 100644 packages/order-watcher/src/fetchers/asset_balance_and_proxy_allowance_fetcher.ts
 delete mode 100644 packages/order-watcher/src/fetchers/order_filled_cancelled_fetcher.ts

(limited to 'packages/order-watcher')

diff --git a/packages/order-watcher/src/fetchers/asset_balance_and_proxy_allowance_fetcher.ts b/packages/order-watcher/src/fetchers/asset_balance_and_proxy_allowance_fetcher.ts
deleted file mode 100644
index a1de22a5e..000000000
--- a/packages/order-watcher/src/fetchers/asset_balance_and_proxy_allowance_fetcher.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-// tslint:disable:no-unnecessary-type-assertion
-import { BlockParamLiteral, ERC20TokenWrapper, ERC721TokenWrapper } from '@0xproject/contract-wrappers';
-import { AbstractBalanceAndProxyAllowanceFetcher, assetDataUtils } from '@0xproject/order-utils';
-import { AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
-
-export class AssetBalanceAndProxyAllowanceFetcher implements AbstractBalanceAndProxyAllowanceFetcher {
-    private readonly _erc20Token: ERC20TokenWrapper;
-    private readonly _erc721Token: ERC721TokenWrapper;
-    private readonly _stateLayer: BlockParamLiteral;
-    constructor(erc20Token: ERC20TokenWrapper, erc721Token: ERC721TokenWrapper, stateLayer: BlockParamLiteral) {
-        this._erc20Token = erc20Token;
-        this._erc721Token = erc721Token;
-        this._stateLayer = stateLayer;
-    }
-    public async getBalanceAsync(assetData: string, userAddress: string): Promise<BigNumber> {
-        const decodedAssetData = assetDataUtils.decodeAssetDataOrThrow(assetData);
-        if (decodedAssetData.assetProxyId === AssetProxyId.ERC20) {
-            const decodedERC20AssetData = decodedAssetData as ERC20AssetData;
-            const balance = await this._erc20Token.getBalanceAsync(decodedERC20AssetData.tokenAddress, userAddress, {
-                defaultBlock: this._stateLayer,
-            });
-            return balance;
-        } else {
-            const decodedERC721AssetData = decodedAssetData as ERC721AssetData;
-            const tokenOwner = await this._erc721Token.getOwnerOfAsync(
-                decodedERC721AssetData.tokenAddress,
-                decodedERC721AssetData.tokenId,
-                {
-                    defaultBlock: this._stateLayer,
-                },
-            );
-            const balance = tokenOwner === userAddress ? new BigNumber(1) : new BigNumber(0);
-            return balance;
-        }
-    }
-    public async getProxyAllowanceAsync(assetData: string, userAddress: string): Promise<BigNumber> {
-        const decodedAssetData = assetDataUtils.decodeAssetDataOrThrow(assetData);
-        if (decodedAssetData.assetProxyId === AssetProxyId.ERC20) {
-            const decodedERC20AssetData = decodedAssetData as ERC20AssetData;
-            const proxyAllowance = await this._erc20Token.getProxyAllowanceAsync(
-                decodedERC20AssetData.tokenAddress,
-                userAddress,
-                {
-                    defaultBlock: this._stateLayer,
-                },
-            );
-            return proxyAllowance;
-        } else {
-            const decodedERC721AssetData = decodedAssetData as ERC721AssetData;
-
-            const isApprovedForAll = await this._erc721Token.isProxyApprovedForAllAsync(
-                decodedERC721AssetData.tokenAddress,
-                userAddress,
-                {
-                    defaultBlock: this._stateLayer,
-                },
-            );
-            if (isApprovedForAll) {
-                return new BigNumber(this._erc20Token.UNLIMITED_ALLOWANCE_IN_BASE_UNITS);
-            } else {
-                const isApproved = await this._erc721Token.isProxyApprovedAsync(
-                    decodedERC721AssetData.tokenAddress,
-                    decodedERC721AssetData.tokenId,
-                    {
-                        defaultBlock: this._stateLayer,
-                    },
-                );
-                const proxyAllowance = isApproved ? new BigNumber(1) : new BigNumber(0);
-                return proxyAllowance;
-            }
-        }
-    }
-}
diff --git a/packages/order-watcher/src/fetchers/order_filled_cancelled_fetcher.ts b/packages/order-watcher/src/fetchers/order_filled_cancelled_fetcher.ts
deleted file mode 100644
index bfad1a48c..000000000
--- a/packages/order-watcher/src/fetchers/order_filled_cancelled_fetcher.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// tslint:disable:no-unnecessary-type-assertion
-import { BlockParamLiteral, ExchangeWrapper } from '@0xproject/contract-wrappers';
-import { AbstractOrderFilledCancelledFetcher } from '@0xproject/order-utils';
-import { BigNumber } from '@0xproject/utils';
-
-export class OrderFilledCancelledFetcher implements AbstractOrderFilledCancelledFetcher {
-    private readonly _exchange: ExchangeWrapper;
-    private readonly _stateLayer: BlockParamLiteral;
-    constructor(exchange: ExchangeWrapper, stateLayer: BlockParamLiteral) {
-        this._exchange = exchange;
-        this._stateLayer = stateLayer;
-    }
-    public async getFilledTakerAmountAsync(orderHash: string): Promise<BigNumber> {
-        const filledTakerAmount = this._exchange.getFilledTakerAssetAmountAsync(orderHash, {
-            defaultBlock: this._stateLayer,
-        });
-        return filledTakerAmount;
-    }
-    public async isOrderCancelledAsync(orderHash: string): Promise<boolean> {
-        const isCancelled = await this._exchange.isCancelledAsync(orderHash);
-        return isCancelled;
-    }
-    public getZRXAssetData(): string {
-        const zrxAssetData = this._exchange.getZRXAssetData();
-        return zrxAssetData;
-    }
-}
-- 
cgit