From e5a238aa9da84fc67e98e0ce8d1ace413e594214 Mon Sep 17 00:00:00 2001
From: Jun <junnplus@gmail.com>
Date: Tue, 25 Mar 2025 14:12:20 +0900
Subject: [PATCH] okx: optimise GetFuturesPositionOrders (#1830)

Signed-off-by: Ye Sijun <junnplus@gmail.com>
---
 exchanges/futures/contract.go |  1 +
 exchanges/okx/okx_wrapper.go  | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/exchanges/futures/contract.go b/exchanges/futures/contract.go
index 217edc43..f236a4ff 100644
--- a/exchanges/futures/contract.go
+++ b/exchanges/futures/contract.go
@@ -14,6 +14,7 @@ import (
 // var error definitions
 var (
 	ErrInvalidContractSettlementType = errors.New("invalid contract settlement type")
+	ErrContractNotSupported          = errors.New("unsupported contract")
 )
 
 // Contract holds details on futures contracts
diff --git a/exchanges/okx/okx_wrapper.go b/exchanges/okx/okx_wrapper.go
index e7b7b3ed..43231ce7 100644
--- a/exchanges/okx/okx_wrapper.go
+++ b/exchanges/okx/okx_wrapper.go
@@ -2573,6 +2573,10 @@ func (ok *Okx) GetFuturesPositionOrders(ctx context.Context, req *futures.Positi
 	if err != nil {
 		return nil, err
 	}
+	contractsMap := make(map[currency.Pair]*futures.Contract)
+	for i := range contracts {
+		contractsMap[contracts[i].Name] = &contracts[i]
+	}
 	for i := range req.Pairs {
 		fPair, err := ok.FormatExchangeCurrency(req.Pairs[i], req.Asset)
 		if err != nil {
@@ -2580,18 +2584,12 @@ func (ok *Okx) GetFuturesPositionOrders(ctx context.Context, req *futures.Positi
 		}
 		instrumentType := GetInstrumentTypeFromAssetItem(req.Asset)
 
-		multiplier := 1.0
-		var contractSettlementType futures.ContractSettlementType
-		if req.Asset.IsFutures() {
-			for j := range contracts {
-				if !contracts[j].Name.Equal(fPair) {
-					continue
-				}
-				multiplier = contracts[j].Multiplier
-				contractSettlementType = contracts[j].SettlementType
-				break
-			}
+		contract, exist := contractsMap[fPair]
+		if !exist {
+			return nil, fmt.Errorf("%w %v", futures.ErrContractNotSupported, fPair)
 		}
+		multiplier := contract.Multiplier
+		contractSettlementType := contract.SettlementType
 
 		resp[i] = futures.PositionResponse{
 			Pair:                   req.Pairs[i],
@@ -2617,7 +2615,7 @@ func (ok *Okx) GetFuturesPositionOrders(ctx context.Context, req *futures.Positi
 			return nil, err
 		}
 		for j := range positions {
-			if req.Pairs[i].String() != positions[j].InstrumentID {
+			if fPair.String() != positions[j].InstrumentID {
 				continue
 			}
 			var orderStatus order.Status