Reverted some unnecessary changes

0xProject · Jun 2, 2020 · a4cf172 · a4cf172
1 parent 1692d58
commit a4cf172
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/packages/rpc-client/package.json b/packages/rpc-client/package.json
@@ -73,7 +73,7 @@
         "shx": "^0.3.2",
         "tslint": "5.11.0",
         "typedoc": "^0.15.0",
-        "typescript": "^3.9.3",
+        "typescript": "3.0.1",
         "uuid-validate": "^0.0.3"
     },
     "publishConfig": {

diff --git a/packages/rpc-client/src/global.d.ts → packages/rpc-client/src/globals.d.ts b/packages/rpc-client/src/global.d.ts → packages/rpc-client/src/globals.d.ts
diff --git a/yarn.lock b/yarn.lock
@@ -176,7 +176,7 @@
 "@0x/mesh-browser@file:packages/browser":
   version "1.0.0"
   dependencies:
-    "@0x/mesh-browser-lite" "file:../Library/Caches/Yarn/v6/npm-@0x-mesh-browser-1.0.0-2400d985-e271-4eb3-b263-b401d93c20d7-1591055460757/node_modules/@0x/browser-lite"
+    "@0x/mesh-browser-lite" "file:../Library/Caches/Yarn/v6/npm-@0x-mesh-browser-1.0.0-83a6287d-365b-44da-8590-72761ff9d0cd-1591121028946/node_modules/@0x/browser-lite"
     base64-arraybuffer "^0.2.0"
     browserfs "^1.4.3"
     ethereum-types "^3.0.0"
@@ -8394,7 +8394,7 @@ typescript@3.7.x:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
   integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
 
-typescript@^3.5.3, typescript@^3.9.3:
+typescript@^3.0.1, typescript@^3.5.3, typescript@^3.9.3:
   version "3.9.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
   integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==

diff --git a/zeroex/orderwatch/decoder/event_decoder.go b/zeroex/orderwatch/decoder/event_decoder.go
@@ -874,15 +874,7 @@ func (d *Decoder) decodeERC721(log types.Log, decodedLog interface{}) error {
 
 	erc721Err := unpackLog(decodedLog, eventName, log, d.erc721ABI)
 	if erc721Err != nil {
-		// FIXME(jalextowle): Is this even necessary anymore?
-		if _, ok := erc721Err.(UnsupportedEventError); ok {
-			// Try unpacking using the incorrect ERC721 event ABIs
-			fallbackErr := unpackLog(decodedLog, eventName, log, d.erc721EventsAbiWithoutTokenIDIndex)
-			if fallbackErr != nil {
-				// We return the original attempt's error if the fallback fails
-				return erc721Err
-			}
-		} else if strings.Contains(erc721Err.Error(), "Unpack(no-values unmarshalled") {
+		if strings.Contains(erc721Err.Error(), "Unpack(no-values unmarshalled") {
 			// Try unpacking using the incorrect ERC721 event ABIs
 			fallbackErr := unpackLog(decodedLog, eventName, log, d.erc721EventsAbiWithoutTokenIDIndex)
 			if fallbackErr != nil {