Remove redundant getTrade(id) method

Resolves issue found during bisq-network#4673 review, and mentioned in comment bisq-network#4673 (comment)
ghubstan · Oct 22, 2020 · fa0e05a · fa0e05a
1 parent 2ae6bfa
commit fa0e05a
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/core/src/main/java/bisq/core/api/CoreTradesService.java b/core/src/main/java/bisq/core/api/CoreTradesService.java
@@ -82,7 +82,7 @@ void takeOffer(Offer offer,
     }
 
     void confirmPaymentStarted(String tradeId) {
-        var trade = getTradeWithId(tradeId);
+        var trade = getTrade(tradeId);
         if (isFollowingBuyerProtocol(trade)) {
             var tradeProtocol = tradeManager.getTradeProtocol(trade);
             ((BuyerProtocol) tradeProtocol).onPaymentStarted(
@@ -98,7 +98,7 @@ void confirmPaymentStarted(String tradeId) {
     }
 
     void confirmPaymentReceived(String tradeId) {
-        var trade = getTradeWithId(tradeId);
+        var trade = getTrade(tradeId);
         if (isFollowingBuyerProtocol(trade)) {
             throw new IllegalStateException("you are the buyer, and not receiving payment");
         } else {
@@ -114,10 +114,6 @@ void confirmPaymentReceived(String tradeId) {
     }
 
     Trade getTrade(String tradeId) {
-        return getTradeWithId(tradeId);
-    }
-
-    private Trade getTradeWithId(String tradeId) {
         return tradeManager.getTradeById(tradeId).orElseThrow(() ->
                 new IllegalArgumentException(format("trade with id '%s' not found", tradeId)));
     }