Don't unsubscribe on error. It's done automatically

3 files changed, 5 insertions, 28 deletions

diff --git a/packages/website/package.json b/packages/website/package.json
index 95e060552..13ee2b082 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -18,7 +18,7 @@
   "author": "Fabio Berger",
   "license": "Apache-2.0",
   "dependencies": {
-    "0x.js": "0xproject/0x.js/packages/0x.js#0x.js@0.27.1",
+    "0x.js": "^0.27.2",
     "@0xproject/subproviders": "^0.1.0",
     "accounting": "^0.4.1",
     "basscss": "^8.0.3",
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 76640a072..172ba6b52 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -468,8 +468,7 @@ export class Blockchain {
     public destroy() {
         clearInterval(this.zrxPollIntervalId);
         this.web3Wrapper.destroy();
-        // tslint:disable-next-line:no-floating-promises
-        this.stopWatchingExchangeLogFillEventsAsync(); // fire and forget
+        this.stopWatchingExchangeLogFillEvents();
     }
     private async showEtherScanLinkAndAwaitTransactionMinedAsync(
         txHash: string): Promise<TransactionReceiptWithDecodedLogs> {
@@ -485,7 +484,7 @@ export class Blockchain {
     }
     private async rehydrateStoreWithContractEvents() {
         // Ensure we are only ever listening to one set of events
-        await this.stopWatchingExchangeLogFillEventsAsync();
+        this.stopWatchingExchangeLogFillEvents();
 
         if (!this.doesUserAddressExist()) {
             return; // short-circuit
@@ -517,8 +516,6 @@ export class Blockchain {
                 // to rollbar and stop watching when one occurs
                 // tslint:disable-next-line:no-floating-promises
                 errorReporter.reportAsync(err); // fire and forget
-                // tslint:disable-next-line:no-floating-promises
-                this.stopWatchingExchangeLogFillEventsAsync(); // fire and forget
                 return;
             } else {
                 const decodedLog = decodedLogEvent.log;
@@ -593,7 +590,7 @@ export class Blockchain {
             tradeHistoryStorage.setFillsLatestBlock(this.userAddress, this.networkId, blockNumberToSet);
         }
     }
-    private async stopWatchingExchangeLogFillEventsAsync() {
+    private stopWatchingExchangeLogFillEvents(): void {
         this.zeroEx.exchange.unsubscribeAll();
     }
     private async getTokenRegistryTokensByAddressAsync(): Promise<TokenByAddress> {
diff --git a/yarn.lock b/yarn.lock
index 3777c8ef2..edc5788cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,26 +9,6 @@
     jsonschema "^1.2.0"
     lodash.values "^4.3.0"
 
-"0x.js@0xproject/0x.js/packages/0x.js#0x.js@0.27.1":
-  version "0.27.1"
-  resolved "https://registry.yarnpkg.com/0x.js/-/0x.js-0.27.1.tgz#e0dff70e257efbb7f54dddb55dddf2dce0b971ab"
-  dependencies:
-    "@0xproject/assert" "^0.0.6"
-    "@0xproject/json-schemas" "^0.6.9"
-    bignumber.js "~4.1.0"
-    bintrees "^1.0.2"
-    bn.js "4.11.8"
-    compare-versions "^3.0.1"
-    es6-promisify "^5.0.0"
-    ethereumjs-abi "^0.6.4"
-    ethereumjs-blockstream "^2.0.6"
-    ethereumjs-util "^5.1.1"
-    find-versions "^2.0.0"
-    js-sha3 "^0.6.1"
-    lodash "^4.17.4"
-    uuid "^3.1.0"
-    web3 "^0.20.0"
-
 "0x.js@^0.22.6":
   version "0.22.6"
   resolved "https://registry.yarnpkg.com/0x.js/-/0x.js-0.22.6.tgz#bc3ff79b6d71f8cf7fae3c78b2c776cfa79c193a"
@@ -1355,7 +1335,7 @@ bn.js@4.11.7:
   version "4.11.7"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
 
-bn.js@4.11.8, bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.3, bn.js@^4.11.6, bn.js@^4.11.7, bn.js@^4.11.8, bn.js@^4.4.0, bn.js@^4.8.0:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.3, bn.js@^4.11.6, bn.js@^4.11.7, bn.js@^4.11.8, bn.js@^4.4.0, bn.js@^4.8.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"