Push Trade->TradeModel mapping down from CoreApi into CoreTradesService

bisq-network · Jan 25, 2022 · 4c8cec5 · 4c8cec5
1 parent ef00a2c
commit 4c8cec5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/java/bisq/core/api/CoreApi.java b/core/src/main/java/bisq/core/api/CoreApi.java
@@ -52,7 +52,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -332,7 +331,7 @@ public TradeModel getTradeModel(String tradeId) {
     }
 
     public List<TradeModel> getOpenTrades() {
-        return coreTradesService.getOpenTrades().stream().map(t -> (TradeModel) t).collect(Collectors.toList());
+        return coreTradesService.getOpenTrades();
     }
 
     public List<TradeModel> getTradeHistory(GetTradesRequest.Category category) {

diff --git a/core/src/main/java/bisq/core/api/CoreTradesService.java b/core/src/main/java/bisq/core/api/CoreTradesService.java
@@ -289,10 +289,10 @@ Trade getTrade(String tradeId) {
                 ));
     }
 
-    List<Trade> getOpenTrades() {
+    List<TradeModel> getOpenTrades() {
         coreWalletsService.verifyWalletsAreAvailable();
         coreWalletsService.verifyEncryptedWalletIsUnlocked();
-        return tradeManager.getTrades();
+        return tradeManager.getTrades().stream().map(t -> (TradeModel) t).collect(Collectors.toList());
     }
 
     List<TradeModel> getTradeHistory(GetTradesRequest.Category category) {