Merge pull request #4712 from ghubstan/11-test-closetrade-impls

Test trade closing api methods 'keepfunds' and 'withdrawfunds'

apitest/src/test/java/bisq/apitest/ApiTestCase.java

@@ -26,6 +26,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
+import org.junit.jupiter.api.TestInfo;
+
 import static java.util.Arrays.stream;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
@@ -117,4 +119,10 @@ protected static void sleep(long ms) {
             // empty
         }
     }
+
+    protected final String testName(TestInfo testInfo) {
+        return testInfo.getTestMethod().isPresent()
+                ? testInfo.getTestMethod().get().getName()
+                : "unknown test name";
+    }
 }

apitest/src/test/java/bisq/apitest/method/MethodTest.java

@@ -25,6 +25,7 @@
 import bisq.proto.grpc.GetOfferRequest;
 import bisq.proto.grpc.GetPaymentAccountsRequest;
 import bisq.proto.grpc.GetTradeRequest;
+import bisq.proto.grpc.KeepFundsRequest;
 import bisq.proto.grpc.LockWalletRequest;
 import bisq.proto.grpc.MarketPriceRequest;
 import bisq.proto.grpc.OfferInfo;
@@ -34,11 +35,14 @@
 import bisq.proto.grpc.TakeOfferRequest;
 import bisq.proto.grpc.TradeInfo;
 import bisq.proto.grpc.UnlockWalletRequest;
+import bisq.proto.grpc.WithdrawFundsRequest;
 
 import protobuf.PaymentAccount;
 
 import java.util.stream.Collectors;
 
+import static bisq.apitest.config.BisqAppConfig.alicedaemon;
+import static bisq.apitest.config.BisqAppConfig.bobdaemon;
 import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY;
 import static bisq.core.payment.payload.PaymentMethod.PERFECT_MONEY;
 import static java.util.Comparator.comparing;
@@ -48,13 +52,28 @@
 
 import bisq.apitest.ApiTestCase;
 import bisq.apitest.config.BisqAppConfig;
+import bisq.cli.GrpcStubs;
 
 public class MethodTest extends ApiTestCase {
 
     protected static final String ARBITRATOR = "arbitrator";
     protected static final String MEDIATOR = "mediator";
     protected static final String REFUND_AGENT = "refundagent";
 
+    protected static GrpcStubs aliceStubs;
+    protected static GrpcStubs bobStubs;
+
+    protected PaymentAccount alicesDummyAcct;
+    protected PaymentAccount bobsDummyAcct;
+
+    protected final void initAlicesDummyPaymentAccount() {
+        alicesDummyAcct = getDefaultPerfectDummyPaymentAccount(alicedaemon);
+    }
+
+    protected final void initBobsDummyPaymentAccount() {
+        bobsDummyAcct = getDefaultPerfectDummyPaymentAccount(bobdaemon);
+    }
+
     // Convenience methods for building gRPC request objects
 
     protected final GetBalanceRequest createBalanceRequest() {
@@ -109,6 +128,19 @@ protected final ConfirmPaymentReceivedRequest createConfirmPaymentReceivedReques
         return ConfirmPaymentReceivedRequest.newBuilder().setTradeId(tradeId).build();
     }
 
+    protected final KeepFundsRequest createKeepFundsRequest(String tradeId) {
+        return KeepFundsRequest.newBuilder()
+                .setTradeId(tradeId)
+                .build();
+    }
+
+    protected final WithdrawFundsRequest createWithdrawFundsRequest(String tradeId, String address) {
+        return WithdrawFundsRequest.newBuilder()
+                .setTradeId(tradeId)
+                .setAddress(address)
+                .build();
+    }
+
     // Convenience methods for calling frequently used & thoroughly tested gRPC services.
 
     protected final long getBalance(BisqAppConfig bisqAppConfig) {
@@ -175,16 +207,29 @@ protected final TradeInfo getTrade(BisqAppConfig bisqAppConfig, String tradeId)
         return grpcStubs(bisqAppConfig).tradesService.getTrade(req).getTrade();
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     protected final void confirmPaymentStarted(BisqAppConfig bisqAppConfig, String tradeId) {
         var req = createConfirmPaymentStartedRequest(tradeId);
         grpcStubs(bisqAppConfig).tradesService.confirmPaymentStarted(req);
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     protected final void confirmPaymentReceived(BisqAppConfig bisqAppConfig, String tradeId) {
         var req = createConfirmPaymentReceivedRequest(tradeId);
         grpcStubs(bisqAppConfig).tradesService.confirmPaymentReceived(req);
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    protected final void keepFunds(BisqAppConfig bisqAppConfig, String tradeId) {
+        var req = createKeepFundsRequest(tradeId);
+        grpcStubs(bisqAppConfig).tradesService.keepFunds(req);
+    }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    protected final void withdrawFunds(BisqAppConfig bisqAppConfig, String tradeId, String address) {
+        var req = createWithdrawFundsRequest(tradeId, address);
+        grpcStubs(bisqAppConfig).tradesService.withdrawFunds(req);
+    }
     // Static conveniences for test methods and test case fixture setups.
 
     protected static RegisterDisputeAgentRequest createRegisterDisputeAgentRequest(String disputeAgentType) {

apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java

@@ -56,8 +56,7 @@ public static void setUp() {
     @Test
     @Order(1)
     public void testRegisterArbitratorShouldThrowException() {
-        var req =
-                createRegisterDisputeAgentRequest(ARBITRATOR);
+        var req = createRegisterDisputeAgentRequest(ARBITRATOR);
         Throwable exception = assertThrows(StatusRuntimeException.class, () ->
                 grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req));
         assertEquals("INVALID_ARGUMENT: arbitrators must be registered in a Bisq UI",
@@ -67,8 +66,7 @@ public void testRegisterArbitratorShouldThrowException() {
     @Test
     @Order(2)
     public void testInvalidDisputeAgentTypeArgShouldThrowException() {
-        var req =
-                createRegisterDisputeAgentRequest("badagent");
+        var req = createRegisterDisputeAgentRequest("badagent");
         Throwable exception = assertThrows(StatusRuntimeException.class, () ->
                 grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req));
         assertEquals("INVALID_ARGUMENT: unknown dispute agent type 'badagent'",
@@ -90,16 +88,14 @@ public void testInvalidRegistrationKeyArgShouldThrowException() {
     @Test
     @Order(4)
     public void testRegisterMediator() {
-        var req =
-                createRegisterDisputeAgentRequest(MEDIATOR);
+        var req = createRegisterDisputeAgentRequest(MEDIATOR);
         grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req);
     }
 
     @Test
     @Order(5)
     public void testRegisterRefundAgent() {
-        var req =
-                createRegisterDisputeAgentRequest(REFUND_AGENT);
+        var req = createRegisterDisputeAgentRequest(REFUND_AGENT);
         grpcStubs(arbdaemon).disputeAgentsService.registerDisputeAgent(req);
     }
 

apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java

@@ -36,6 +36,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 
 import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
 import static bisq.apitest.config.BisqAppConfig.alicedaemon;
@@ -59,14 +60,16 @@
 @Slf4j
 public abstract class AbstractOfferTest extends MethodTest {
 
-    protected static GrpcStubs aliceStubs;
-    protected static GrpcStubs bobStubs;
-
     @BeforeAll
     public static void setUp() {
         startSupportingApps();
     }
 
+    @BeforeEach
+    public void initDummyPaymentAccount() {
+        super.initAlicesDummyPaymentAccount();
+    }
+
     static void startSupportingApps() {
         try {
             // setUpScaffold(new String[]{"--supportingApps", "bitcoind,seednode,arbdaemon,alicedaemon,bobdaemon", "--enableBisqDebugging", "true"});

apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java

@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
-import static bisq.apitest.config.BisqAppConfig.alicedaemon;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -37,12 +36,12 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest {
 
+
     @Test
     @Order(1)
     public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() {
-        var paymentAccount = getDefaultPerfectDummyPaymentAccount(alicedaemon);
         var req = CreateOfferRequest.newBuilder()
-                .setPaymentAccountId(paymentAccount.getId())
+                .setPaymentAccountId(alicesDummyAcct.getId())
                 .setDirection("buy")
                 .setCurrencyCode("aud")
                 .setAmount(10000000)
@@ -61,7 +60,7 @@ public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() {
         assertEquals(10000000, newOffer.getAmount());
         assertEquals(10000000, newOffer.getMinAmount());
         assertEquals(1500000, newOffer.getBuyerSecurityDeposit());
-        assertEquals(paymentAccount.getId(), newOffer.getPaymentAccountId());
+        assertEquals(alicesDummyAcct.getId(), newOffer.getPaymentAccountId());
         assertEquals("BTC", newOffer.getBaseCurrencyCode());
         assertEquals("AUD", newOffer.getCounterCurrencyCode());
 
@@ -73,17 +72,16 @@ public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() {
         assertEquals(10000000, newOffer.getAmount());
         assertEquals(10000000, newOffer.getMinAmount());
         assertEquals(1500000, newOffer.getBuyerSecurityDeposit());
-        assertEquals(paymentAccount.getId(), newOffer.getPaymentAccountId());
+        assertEquals(alicesDummyAcct.getId(), newOffer.getPaymentAccountId());
         assertEquals("BTC", newOffer.getBaseCurrencyCode());
         assertEquals("AUD", newOffer.getCounterCurrencyCode());
     }
 
     @Test
     @Order(2)
     public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() {
-        var paymentAccount = getDefaultPerfectDummyPaymentAccount(alicedaemon);
         var req = CreateOfferRequest.newBuilder()
-                .setPaymentAccountId(paymentAccount.getId())
+                .setPaymentAccountId(alicesDummyAcct.getId())
                 .setDirection("buy")
                 .setCurrencyCode("usd")
                 .setAmount(10000000)
@@ -102,7 +100,7 @@ public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() {
         assertEquals(10000000, newOffer.getAmount());
         assertEquals(10000000, newOffer.getMinAmount());
         assertEquals(1500000, newOffer.getBuyerSecurityDeposit());
-        assertEquals(paymentAccount.getId(), newOffer.getPaymentAccountId());
+        assertEquals(alicesDummyAcct.getId(), newOffer.getPaymentAccountId());
         assertEquals("BTC", newOffer.getBaseCurrencyCode());
         assertEquals("USD", newOffer.getCounterCurrencyCode());
 
@@ -114,17 +112,16 @@ public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() {
         assertEquals(10000000, newOffer.getAmount());
         assertEquals(10000000, newOffer.getMinAmount());
         assertEquals(1500000, newOffer.getBuyerSecurityDeposit());
-        assertEquals(paymentAccount.getId(), newOffer.getPaymentAccountId());
+        assertEquals(alicesDummyAcct.getId(), newOffer.getPaymentAccountId());
         assertEquals("BTC", newOffer.getBaseCurrencyCode());
         assertEquals("USD", newOffer.getCounterCurrencyCode());
     }
 
     @Test
     @Order(3)
     public void testCreateEURBTCSellOfferUsingFixedPrice95001234() {
-        var paymentAccount = getDefaultPerfectDummyPaymentAccount(alicedaemon);
         var req = CreateOfferRequest.newBuilder()
-                .setPaymentAccountId(paymentAccount.getId())
+                .setPaymentAccountId(alicesDummyAcct.getId())
                 .setDirection("sell")
                 .setCurrencyCode("eur")
                 .setAmount(10000000)
@@ -143,7 +140,7 @@ public void testCreateEURBTCSellOfferUsingFixedPrice95001234() {
         assertEquals(10000000, newOffer.getAmount());
         assertEquals(10000000, newOffer.getMinAmount());
         assertEquals(1500000, newOffer.getBuyerSecurityDeposit());
-        assertEquals(paymentAccount.getId(), newOffer.getPaymentAccountId());
+        assertEquals(alicesDummyAcct.getId(), newOffer.getPaymentAccountId());
         assertEquals("BTC", newOffer.getBaseCurrencyCode());
         assertEquals("EUR", newOffer.getCounterCurrencyCode());
 
@@ -155,7 +152,7 @@ public void testCreateEURBTCSellOfferUsingFixedPrice95001234() {
         assertEquals(10000000, newOffer.getAmount());
         assertEquals(10000000, newOffer.getMinAmount());
         assertEquals(1500000, newOffer.getBuyerSecurityDeposit());
-        assertEquals(paymentAccount.getId(), newOffer.getPaymentAccountId());
+        assertEquals(alicesDummyAcct.getId(), newOffer.getPaymentAccountId());
         assertEquals("BTC", newOffer.getBaseCurrencyCode());
         assertEquals("EUR", newOffer.getCounterCurrencyCode());
     }