Merge pull request ethereum#589 from thanhnguyennguyen/M1-attach-corr…

…ect-orderItem-to-txMatches M1 attaches correct orderItem to txMatches
ngtuna · Jul 25, 2019 · a9c207f · a9c207f
2 parents 0838de8 + bd346da
commit a9c207f
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/tomox/tomox.go b/tomox/tomox.go
@@ -827,6 +827,11 @@ func (tomox *TomoX) ProcessOrderPending() map[common.Hash]TxDataMatch {
 							log.Error("Fail to get bid tree hash old", "err", err)
 							continue
 						}
+						value, err := EncodeBytesItem(order)
+						if err != nil {
+							log.Error("Can't encode", "order", order, "err", err)
+							continue
+						}
 						trades, _, err := ob.ProcessOrder(order, true, true)
 						if err != nil {
 							log.Error("Can't process order", "order", order, "err", err)
@@ -848,21 +853,16 @@ func (tomox *TomoX) ProcessOrderPending() map[common.Hash]TxDataMatch {
 							continue
 						}
 
-						value, err := EncodeBytesItem(order)
-						if err != nil {
-							log.Error("Can't encode", "order", order, "err", err)
-							continue
-						} else {
-							txMatches[order.Hash] = TxDataMatch{
-								Order:  value,
-								Trades: trades,
-								ObOld:  obOld,
-								ObNew:  obNew,
-								AskOld: askOld,
-								AskNew: askNew,
-								BidOld: bidOld,
-								BidNew: bidNew,
-							}
+						log.Info("Process OrderPending completed", "obNew", hex.EncodeToString(obNew.Bytes()), "bidNew", hex.EncodeToString(bidNew.Bytes()), "askNew", hex.EncodeToString(askNew.Bytes()))
+						txMatches[order.Hash] = TxDataMatch{
+							Order:  value,
+							Trades: trades,
+							ObOld:  obOld,
+							ObNew:  obNew,
+							AskOld: askOld,
+							AskNew: askNew,
+							BidOld: bidOld,
+							BidNew: bidNew,
 						}
 					}
 				} else {