aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-02-12 12:02:54 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-04-21 04:56:16 +0800
commitdf99a360fb3467b80952416ed1d1802f3599ee8d (patch)
tree86f2982184635bdcb9a74a7d24409f92ad133dc6 /packages
parent4c76ad072a043253085fc0f08f47afb30bb6f834 (diff)
downloaddexon-sol-tools-df99a360fb3467b80952416ed1d1802f3599ee8d.tar
dexon-sol-tools-df99a360fb3467b80952416ed1d1802f3599ee8d.tar.gz
dexon-sol-tools-df99a360fb3467b80952416ed1d1802f3599ee8d.tar.bz2
dexon-sol-tools-df99a360fb3467b80952416ed1d1802f3599ee8d.tar.lz
dexon-sol-tools-df99a360fb3467b80952416ed1d1802f3599ee8d.tar.xz
dexon-sol-tools-df99a360fb3467b80952416ed1d1802f3599ee8d.tar.zst
dexon-sol-tools-df99a360fb3467b80952416ed1d1802f3599ee8d.zip
Rename variables
Diffstat (limited to 'packages')
-rw-r--r--packages/contracts/src/utils/exchange_wrapper.ts42
-rw-r--r--packages/contracts/src/utils/log_decoder.ts12
2 files changed, 27 insertions, 27 deletions
diff --git a/packages/contracts/src/utils/exchange_wrapper.ts b/packages/contracts/src/utils/exchange_wrapper.ts
index 4887a1f07..f86b507e9 100644
--- a/packages/contracts/src/utils/exchange_wrapper.ts
+++ b/packages/contracts/src/utils/exchange_wrapper.ts
@@ -36,9 +36,9 @@ export class ExchangeWrapper {
const tx = await this._zeroEx.awaitTransactionMinedAsync(txHash);
tx.logs = _.filter(tx.logs, log => log.address === this._exchange.address);
tx.logs = _.map(tx.logs, log => {
- const decodedLog = this._logDecoder.tryToDecodeLogOrNoop(log);
- wrapLogBigNumbers(decodedLog);
- return decodedLog;
+ const logWithDecodedArgs = this._logDecoder.tryToDecodeLogOrNoop(log);
+ wrapLogBigNumbers(logWithDecodedArgs);
+ return logWithDecodedArgs;
});
return tx;
}
@@ -57,9 +57,9 @@ export class ExchangeWrapper {
const tx = await this._zeroEx.awaitTransactionMinedAsync(txHash);
tx.logs = _.filter(tx.logs, log => log.address === this._exchange.address);
tx.logs = _.map(tx.logs, log => {
- const decodedLog = this._logDecoder.tryToDecodeLogOrNoop(log);
- wrapLogBigNumbers(decodedLog);
- return decodedLog;
+ const logWithDecodedArgs = this._logDecoder.tryToDecodeLogOrNoop(log);
+ wrapLogBigNumbers(logWithDecodedArgs);
+ return logWithDecodedArgs;
});
return tx;
}
@@ -81,9 +81,9 @@ export class ExchangeWrapper {
const tx = await this._zeroEx.awaitTransactionMinedAsync(txHash);
tx.logs = _.filter(tx.logs, log => log.address === this._exchange.address);
tx.logs = _.map(tx.logs, log => {
- const decodedLog = this._logDecoder.tryToDecodeLogOrNoop(log);
- wrapLogBigNumbers(decodedLog);
- return decodedLog;
+ const logWithDecodedArgs = this._logDecoder.tryToDecodeLogOrNoop(log);
+ wrapLogBigNumbers(logWithDecodedArgs);
+ return logWithDecodedArgs;
});
return tx;
}
@@ -105,9 +105,9 @@ export class ExchangeWrapper {
const tx = await this._zeroEx.awaitTransactionMinedAsync(txHash);
tx.logs = _.filter(tx.logs, log => log.address === this._exchange.address);
tx.logs = _.map(tx.logs, log => {
- const decodedLog = this._logDecoder.tryToDecodeLogOrNoop(log);
- wrapLogBigNumbers(decodedLog);
- return decodedLog;
+ const logWithDecodedArgs = this._logDecoder.tryToDecodeLogOrNoop(log);
+ wrapLogBigNumbers(logWithDecodedArgs);
+ return logWithDecodedArgs;
});
return tx;
}
@@ -129,9 +129,9 @@ export class ExchangeWrapper {
const tx = await this._zeroEx.awaitTransactionMinedAsync(txHash);
tx.logs = _.filter(tx.logs, log => log.address === this._exchange.address);
tx.logs = _.map(tx.logs, log => {
- const decodedLog = this._logDecoder.tryToDecodeLogOrNoop(log);
- wrapLogBigNumbers(decodedLog);
- return decodedLog;
+ const logWithDecodedArgs = this._logDecoder.tryToDecodeLogOrNoop(log);
+ wrapLogBigNumbers(logWithDecodedArgs);
+ return logWithDecodedArgs;
});
return tx;
}
@@ -153,9 +153,9 @@ export class ExchangeWrapper {
const tx = await this._zeroEx.awaitTransactionMinedAsync(txHash);
tx.logs = _.filter(tx.logs, log => log.address === this._exchange.address);
tx.logs = _.map(tx.logs, log => {
- const decodedLog = this._logDecoder.tryToDecodeLogOrNoop(log);
- wrapLogBigNumbers(decodedLog);
- return decodedLog;
+ const logWithDecodedArgs = this._logDecoder.tryToDecodeLogOrNoop(log);
+ wrapLogBigNumbers(logWithDecodedArgs);
+ return logWithDecodedArgs;
});
return tx;
}
@@ -174,9 +174,9 @@ export class ExchangeWrapper {
const tx = await this._zeroEx.awaitTransactionMinedAsync(txHash);
tx.logs = _.filter(tx.logs, log => log.address === this._exchange.address);
tx.logs = _.map(tx.logs, log => {
- const decodedLog = this._logDecoder.tryToDecodeLogOrNoop(log);
- wrapLogBigNumbers(decodedLog);
- return decodedLog;
+ const logWithDecodedArgs = this._logDecoder.tryToDecodeLogOrNoop(log);
+ wrapLogBigNumbers(logWithDecodedArgs);
+ return logWithDecodedArgs;
});
return tx;
}
diff --git a/packages/contracts/src/utils/log_decoder.ts b/packages/contracts/src/utils/log_decoder.ts
index 98dd8eab6..89f641078 100644
--- a/packages/contracts/src/utils/log_decoder.ts
+++ b/packages/contracts/src/utils/log_decoder.ts
@@ -8,17 +8,17 @@ import { Artifact } from './types';
export class LogDecoder {
private _abiDecoder: AbiDecoder;
- constructor(networkId: number) {
- if (_.isUndefined(networkId)) {
+ constructor(networkIdIfExists?: number) {
+ if (_.isUndefined(networkIdIfExists)) {
throw new Error('networkId not specified');
}
const abiArrays: Web3.AbiDefinition[][] = [];
_.forEach(artifacts, (artifact: Artifact) => {
- const network = artifact.networks[networkId];
- if (_.isUndefined(network)) {
- throw new Error(`Artifact does not exist on network ${networkId}`);
+ const networkIfExists = artifact.networks[networkIdIfExists];
+ if (_.isUndefined(networkIfExists)) {
+ throw new Error(`Artifact does not exist on network ${networkIdIfExists}`);
}
- abiArrays.push(network.abi);
+ abiArrays.push(networkIfExists.abi);
});
this._abiDecoder = new AbiDecoder(abiArrays);
}