aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-07-12 09:00:17 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-07-12 09:00:17 +0800
commit468c95a4c2f5a153fe4d8cf34fe09d6e07550e05 (patch)
tree5677acec1946f7131c6426f9986dc997b9060bc3
parent6033c1a5d5f494d1ed27b00488ca458952341ae6 (diff)
downloaddexon-sol-tools-468c95a4c2f5a153fe4d8cf34fe09d6e07550e05.tar
dexon-sol-tools-468c95a4c2f5a153fe4d8cf34fe09d6e07550e05.tar.gz
dexon-sol-tools-468c95a4c2f5a153fe4d8cf34fe09d6e07550e05.tar.bz2
dexon-sol-tools-468c95a4c2f5a153fe4d8cf34fe09d6e07550e05.tar.lz
dexon-sol-tools-468c95a4c2f5a153fe4d8cf34fe09d6e07550e05.tar.xz
dexon-sol-tools-468c95a4c2f5a153fe4d8cf34fe09d6e07550e05.tar.zst
dexon-sol-tools-468c95a4c2f5a153fe4d8cf34fe09d6e07550e05.zip
Add forgotten meger conflict resolution
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 2501ef24b..9cc29e286 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -786,27 +786,8 @@ export class ExchangeWrapper extends ContractWrapper {
return this._exchangeContractIfExists;
}
const contractInstance = await this._instantiateContractIfExistsAsync((ExchangeArtifacts as any));
-<<<<<<< HEAD
this._exchangeContractIfExists = contractInstance as ExchangeContract;
return this._exchangeContractIfExists;
-=======
- this._exchangeContractByAddress[exchangeContractAddress] = contractInstance as ExchangeContract;
- return this._exchangeContractByAddress[exchangeContractAddress];
- }
- private _getExchangeArtifactsByAddressOrThrow(exchangeContractAddress: string): ContractArtifact {
- const exchangeArtifacts = _.values<ContractArtifact>(ExchangeArtifactsByName);
- for (const exchangeArtifact of exchangeArtifacts) {
- const networkSpecificExchangeArtifactValues = _.values(exchangeArtifact.networks);
- const exchangeAddressesInArtifact = _.map(
- networkSpecificExchangeArtifactValues,
- networkSpecificExchangeArtifact => networkSpecificExchangeArtifact.address,
- );
- if (_.includes(exchangeAddressesInArtifact, exchangeContractAddress)) {
- return exchangeArtifact;
- }
- }
- throw new Error(ZeroExError.ExchangeContractDoesNotExist);
->>>>>>> Use PascalCase names as string enum keys
}
private async _getZRXTokenAddressAsync(exchangeContractAddress: string): Promise<string> {
const exchangeInstance = await this._getExchangeContractAsync();