From 11cb9a2a3b834e1e6593f1b4dc7eec5d35c71f1a Mon Sep 17 00:00:00 2001
From: fabioberger <me@fabioberger.com>
Date: Tue, 17 Sep 2019 21:26:20 +0200
Subject: [PATCH] Fix rebase issue

---
 zeroex/order_js.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/zeroex/order_js.go b/zeroex/order_js.go
index a2e32dfa3..5562e2add 100644
--- a/zeroex/order_js.go
+++ b/zeroex/order_js.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"syscall/js"
 
-	"github.com/0xProject/0x-mesh/ethereum"
+	"github.com/0xProject/0x-mesh/zeroex/orderwatch/decoder"
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -68,34 +68,34 @@ func (c ContractEvent) JSValue() js.Value {
 	}
 	switch c.Kind {
 	case "ERC20TransferEvent":
-		m["parameters"] = c.Parameters.(ethereum.ERC20TransferEvent)
+		m["parameters"] = c.Parameters.(decoder.ERC20TransferEvent)
 
 	case "ERC20ApprovalEvent":
-		m["parameters"] = c.Parameters.(ethereum.ERC20ApprovalEvent)
+		m["parameters"] = c.Parameters.(decoder.ERC20ApprovalEvent)
 
 	case "ERC721TransferEvent":
-		m["parameters"] = c.Parameters.(ethereum.ERC721TransferEvent)
+		m["parameters"] = c.Parameters.(decoder.ERC721TransferEvent)
 
 	case "ERC721ApprovalEvent":
-		m["parameters"] = c.Parameters.(ethereum.ERC721ApprovalEvent)
+		m["parameters"] = c.Parameters.(decoder.ERC721ApprovalEvent)
 
 	case "ERC721ApprovalForAllEvent":
-		m["parameters"] = c.Parameters.(ethereum.ERC721ApprovalForAllEvent)
+		m["parameters"] = c.Parameters.(decoder.ERC721ApprovalForAllEvent)
 
 	case "WethWithdrawalEvent":
-		m["parameters"] = c.Parameters.(ethereum.WethWithdrawalEvent)
+		m["parameters"] = c.Parameters.(decoder.WethWithdrawalEvent)
 
 	case "WethDepositEvent":
-		m["parameters"] = c.Parameters.(ethereum.WethDepositEvent)
+		m["parameters"] = c.Parameters.(decoder.WethDepositEvent)
 
 	case "ExchangeFillEvent":
-		m["parameters"] = c.Parameters.(ethereum.ExchangeFillEvent)
+		m["parameters"] = c.Parameters.(decoder.ExchangeFillEvent)
 
 	case "ExchangeCancelEvent":
-		m["parameters"] = c.Parameters.(ethereum.ExchangeCancelEvent)
+		m["parameters"] = c.Parameters.(decoder.ExchangeCancelEvent)
 
 	case "ExchangeCancelUpToEvent":
-		m["parameters"] = c.Parameters.(ethereum.ExchangeCancelUpToEvent)
+		m["parameters"] = c.Parameters.(decoder.ExchangeCancelUpToEvent)
 
 	default:
 		panic(fmt.Sprintf("Unrecognized event encountered: %s", c.Kind))