aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-04-01 15:05:55 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-04-02 01:45:30 +0800
commitff7c3012a56d0744fa2bcaec0158c85b04293980 (patch)
treec2350f7b9cf586552e9c1077a9af4f079d15bf46
parent20fec2943bebc50059b1a9a0646f263b07aba88b (diff)
downloaddexon-sol-tools-ff7c3012a56d0744fa2bcaec0158c85b04293980.tar
dexon-sol-tools-ff7c3012a56d0744fa2bcaec0158c85b04293980.tar.gz
dexon-sol-tools-ff7c3012a56d0744fa2bcaec0158c85b04293980.tar.bz2
dexon-sol-tools-ff7c3012a56d0744fa2bcaec0158c85b04293980.tar.lz
dexon-sol-tools-ff7c3012a56d0744fa2bcaec0158c85b04293980.tar.xz
dexon-sol-tools-ff7c3012a56d0744fa2bcaec0158c85b04293980.tar.zst
dexon-sol-tools-ff7c3012a56d0744fa2bcaec0158c85b04293980.zip
Run prettier, update deployer CHANGELOG
-rw-r--r--packages/0x.js/src/order_watcher/event_watcher.ts6
-rw-r--r--packages/0x.js/src/order_watcher/order_state_watcher.ts10
-rw-r--r--packages/0x.js/test/order_state_watcher_test.ts4
-rw-r--r--packages/deployer/CHANGELOG.md4
4 files changed, 13 insertions, 11 deletions
diff --git a/packages/0x.js/src/order_watcher/event_watcher.ts b/packages/0x.js/src/order_watcher/event_watcher.ts
index d01542a8c..47bbd5b2e 100644
--- a/packages/0x.js/src/order_watcher/event_watcher.ts
+++ b/packages/0x.js/src/order_watcher/event_watcher.ts
@@ -23,7 +23,11 @@ export class EventWatcher {
private _intervalIdIfExists?: NodeJS.Timer;
private _lastEvents: LogEntry[] = [];
private _stateLayer: BlockParamLiteral;
- constructor(web3Wrapper: Web3Wrapper, pollingIntervalIfExistsMs: undefined | number, stateLayer: BlockParamLiteral = BlockParamLiteral.Latest) {
+ constructor(
+ web3Wrapper: Web3Wrapper,
+ pollingIntervalIfExistsMs: undefined | number,
+ stateLayer: BlockParamLiteral = BlockParamLiteral.Latest,
+ ) {
this._web3Wrapper = web3Wrapper;
this._stateLayer = stateLayer;
this._pollingIntervalMs = _.isUndefined(pollingIntervalIfExistsMs)
diff --git a/packages/0x.js/src/order_watcher/order_state_watcher.ts b/packages/0x.js/src/order_watcher/order_state_watcher.ts
index bfd250e21..cd6016c5a 100644
--- a/packages/0x.js/src/order_watcher/order_state_watcher.ts
+++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts
@@ -86,14 +86,10 @@ export class OrderStateWatcher {
this._abiDecoder = abiDecoder;
this._web3Wrapper = web3Wrapper;
const pollingIntervalIfExistsMs = _.isUndefined(config) ? undefined : config.eventPollingIntervalMs;
- const stateLayer = _.isUndefined(config) || _.isUndefined(config.stateLayer)
- ? BlockParamLiteral.Latest
- : config.stateLayer;
+ const stateLayer =
+ _.isUndefined(config) || _.isUndefined(config.stateLayer) ? BlockParamLiteral.Latest : config.stateLayer;
this._eventWatcher = new EventWatcher(web3Wrapper, pollingIntervalIfExistsMs, stateLayer);
- this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(
- token,
- stateLayer,
- );
+ this._balanceAndProxyAllowanceLazyStore = new BalanceAndProxyAllowanceLazyStore(token, stateLayer);
this._orderFilledCancelledLazyStore = new OrderFilledCancelledLazyStore(exchange);
this._orderStateUtils = new OrderStateUtils(
this._balanceAndProxyAllowanceLazyStore,
diff --git a/packages/0x.js/test/order_state_watcher_test.ts b/packages/0x.js/test/order_state_watcher_test.ts
index 4f727d495..4210e013f 100644
--- a/packages/0x.js/test/order_state_watcher_test.ts
+++ b/packages/0x.js/test/order_state_watcher_test.ts
@@ -15,9 +15,7 @@ import {
ZeroEx,
ZeroExError,
} from '../src';
-import {
- OrderStateWatcher,
-} from '../src/order_watcher/order_state_watcher';
+import { OrderStateWatcher } from '../src/order_watcher/order_state_watcher';
import { DoneCallback } from '../src/types';
import { chaiSetup } from './utils/chai_setup';
diff --git a/packages/deployer/CHANGELOG.md b/packages/deployer/CHANGELOG.md
index 7d2a0f5e8..ecc8867b9 100644
--- a/packages/deployer/CHANGELOG.md
+++ b/packages/deployer/CHANGELOG.md
@@ -1,5 +1,9 @@
# CHANGELOG
+## v0.3.2 - _TBD_
+
+ * Create solc_bin directory if does not exist before attempting to compile (#491)
+
## v0.3.1 - _March 18, 2018_
* Add TS types for `yargs`