From b50b2e1b214f11e2e8905f16cc6e9fc20d2c0af2 Mon Sep 17 00:00:00 2001
From: Adrian Gallagher <adrian.gallagher@thrasher.io>
Date: Mon, 10 Oct 2022 12:33:28 +1100
Subject: [PATCH] binance/btse/rpcserver: Specify AnySide/AnyType for order
 retrieval and fix order index bugs (#1054)

---
 engine/rpcserver.go                  | 2 ++
 exchanges/binance/binance_wrapper.go | 4 ++--
 exchanges/btse/btse_wrapper.go       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/engine/rpcserver.go b/engine/rpcserver.go
index 1927ca76..3c9c4530 100644
--- a/engine/rpcserver.go
+++ b/engine/rpcserver.go
@@ -955,6 +955,8 @@ func (s *RPCServer) GetOrders(ctx context.Context, r *gctrpc.GetOrdersRequest) (
 	request := &order.GetOrdersRequest{
 		Pairs:     []currency.Pair{cp},
 		AssetType: a,
+		Type:      order.AnyType,
+		Side:      order.AnySide,
 	}
 	if !start.IsZero() {
 		request.StartTime = start
diff --git a/exchanges/binance/binance_wrapper.go b/exchanges/binance/binance_wrapper.go
index ee7715bd..26a52708 100644
--- a/exchanges/binance/binance_wrapper.go
+++ b/exchanges/binance/binance_wrapper.go
@@ -1384,7 +1384,7 @@ func (b *Binance) GetActiveOrders(ctx context.Context, req *order.GetOrdersReque
 				if err != nil {
 					log.Errorf(log.ExchangeSys, "%s %v", b.Name, err)
 				}
-				orderStatus, err := order.StringToOrderStatus(resp[i].Status)
+				orderStatus, err := order.StringToOrderStatus(resp[x].Status)
 				if err != nil {
 					log.Errorf(log.ExchangeSys, "%s %v", b.Name, err)
 				}
@@ -1506,7 +1506,7 @@ func (b *Binance) GetOrderHistory(ctx context.Context, req *order.GetOrdersReque
 
 			for i := range resp {
 				var side order.Side
-				side, err = order.StringToOrderSide(resp[x].Side)
+				side, err = order.StringToOrderSide(resp[i].Side)
 				if err != nil {
 					log.Errorf(log.ExchangeSys, "%s %v", b.Name, err)
 				}
diff --git a/exchanges/btse/btse_wrapper.go b/exchanges/btse/btse_wrapper.go
index 010c1f32..54df65f7 100644
--- a/exchanges/btse/btse_wrapper.go
+++ b/exchanges/btse/btse_wrapper.go
@@ -928,7 +928,7 @@ func (b *BTSE) GetOrderHistory(ctx context.Context, getOrdersRequest *order.GetO
 			if !matchType(currentOrder[y].OrderType, orderDeref.Type) {
 				continue
 			}
-			orderStatus, err := order.StringToOrderStatus(currentOrder[x].OrderState)
+			orderStatus, err := order.StringToOrderStatus(currentOrder[y].OrderState)
 			if err != nil {
 				log.Errorf(log.ExchangeSys, "%s %v", b.Name, err)
 			}