aboutsummaryrefslogtreecommitdiffstats
path: root/packages/order-utils
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-07-18 21:48:23 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-07-18 22:31:17 +0800
commita1acf19ff3c1948214dde05a91eb3fbeac728d2c (patch)
tree44789fff181ec24846728d885ba541c23f682321 /packages/order-utils
parent5044fe4fe4486f67408572cf6807482aecf7f6c9 (diff)
downloaddexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar
dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.gz
dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.bz2
dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.lz
dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.xz
dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.tar.zst
dexon-0x-contracts-a1acf19ff3c1948214dde05a91eb3fbeac728d2c.zip
Fix a bad merge
Diffstat (limited to 'packages/order-utils')
-rw-r--r--packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts4
-rw-r--r--packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts b/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts
index 2c866d190..5a2c1d7ff 100644
--- a/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts
+++ b/packages/order-utils/src/store/balance_and_proxy_allowance_lazy_store.ts
@@ -4,7 +4,7 @@ import * as _ from 'lodash';
import { AbstractBalanceAndProxyAllowanceFetcher } from '../abstract/abstract_balance_and_proxy_allowance_fetcher';
import { AbstractBalanceAndProxyAllowanceLazyStore } from '../abstract/abstract_balance_and_proxy_allowance_lazy_store';
-import { assetProxyUtils } from '../asset_proxy_utils';
+import { assetDataUtils } from '../asset_data_utils';
/**
* Copy on read store for balances/proxyAllowances of tokens/accounts
@@ -79,7 +79,7 @@ export class BalanceAndProxyAllowanceLazyStore implements AbstractBalanceAndProx
public deleteAllERC721ProxyAllowance(tokenAddress: string, userAddress: string): void {
for (const assetData in this._proxyAllowance) {
if (this._proxyAllowance.hasOwnProperty(assetData)) {
- const decodedAssetData = assetProxyUtils.decodeAssetDataOrThrow(assetData);
+ const decodedAssetData = assetDataUtils.decodeAssetDataOrThrow(assetData);
if (
decodedAssetData.assetProxyId === AssetProxyId.ERC721 &&
decodedAssetData.tokenAddress === tokenAddress &&
diff --git a/packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts b/packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts
index 4b1ad70b6..336c6d0ba 100644
--- a/packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts
+++ b/packages/order-utils/src/store/order_filled_cancelled_lazy_store.ts
@@ -8,7 +8,7 @@ import { AbstractOrderFilledCancelledLazyStore } from '../abstract/abstract_orde
* Copy on read store for balances/proxyAllowances of tokens/accounts
*/
export class OrderFilledCancelledLazyStore implements AbstractOrderFilledCancelledLazyStore {
- private _orderFilledCancelledFetcher: AbstractOrderFilledCancelledFetcher;
+ private readonly _orderFilledCancelledFetcher: AbstractOrderFilledCancelledFetcher;
private _filledTakerAmount: {
[orderHash: string]: BigNumber;
};