Add api method 'getpaymentacctform'

apitest/docs/build-run.md

@@ -48,7 +48,7 @@ To run all test cases in a package:
 
 To run a single test case:
 
-    $ ./gradlew  :apitest:test --tests "bisq.apitest.method.GetBalanceTest" -DrunApiTests=true
+    $ ./gradlew  :apitest:test --tests "bisq.apitest.scenario.WalletTest" -DrunApiTests=true
 
 To run test cases from Intellij, add two JVM arguments to your JUnit launchers:
 

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

@@ -17,29 +17,48 @@
 
 package bisq.apitest.method;
 
+import bisq.core.api.model.PaymentAccountForm;
+
+import bisq.proto.grpc.AddressBalanceInfo;
+import bisq.proto.grpc.BalancesInfo;
+import bisq.proto.grpc.BsqBalanceInfo;
+import bisq.proto.grpc.BtcBalanceInfo;
 import bisq.proto.grpc.CancelOfferRequest;
 import bisq.proto.grpc.ConfirmPaymentReceivedRequest;
 import bisq.proto.grpc.ConfirmPaymentStartedRequest;
 import bisq.proto.grpc.CreatePaymentAccountRequest;
-import bisq.proto.grpc.GetBalanceRequest;
+import bisq.proto.grpc.GetAddressBalanceRequest;
+import bisq.proto.grpc.GetBalancesRequest;
 import bisq.proto.grpc.GetFundingAddressesRequest;
 import bisq.proto.grpc.GetOfferRequest;
+import bisq.proto.grpc.GetPaymentAccountFormRequest;
 import bisq.proto.grpc.GetPaymentAccountsRequest;
+import bisq.proto.grpc.GetPaymentMethodsRequest;
 import bisq.proto.grpc.GetTradeRequest;
+import bisq.proto.grpc.GetUnusedBsqAddressRequest;
 import bisq.proto.grpc.KeepFundsRequest;
 import bisq.proto.grpc.LockWalletRequest;
 import bisq.proto.grpc.MarketPriceRequest;
 import bisq.proto.grpc.OfferInfo;
 import bisq.proto.grpc.RegisterDisputeAgentRequest;
 import bisq.proto.grpc.RemoveWalletPasswordRequest;
+import bisq.proto.grpc.SendBsqRequest;
 import bisq.proto.grpc.SetWalletPasswordRequest;
 import bisq.proto.grpc.TakeOfferRequest;
 import bisq.proto.grpc.TradeInfo;
 import bisq.proto.grpc.UnlockWalletRequest;
 import bisq.proto.grpc.WithdrawFundsRequest;
 
 import protobuf.PaymentAccount;
+import protobuf.PaymentMethod;
+
+import java.nio.charset.StandardCharsets;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import java.util.List;
 import java.util.stream.Collectors;
 
 import static bisq.apitest.config.BisqAppConfig.alicedaemon;
@@ -102,9 +121,12 @@ public static void startSupportingApps(boolean registerDisputeAgents,
     }
 
     // Convenience methods for building gRPC request objects
+    protected final GetBalancesRequest createGetBalancesRequest(String currencyCode) {
+        return GetBalancesRequest.newBuilder().setCurrencyCode(currencyCode).build();
+    }
 
-    protected final GetBalanceRequest createBalanceRequest() {
-        return GetBalanceRequest.newBuilder().build();
+    protected final GetAddressBalanceRequest createGetAddressBalanceRequest(String address) {
+        return GetAddressBalanceRequest.newBuilder().setAddress(address).build();
     }
 
     protected final SetWalletPasswordRequest createSetWalletPasswordRequest(String password) {
@@ -127,6 +149,14 @@ protected final LockWalletRequest createLockWalletRequest() {
         return LockWalletRequest.newBuilder().build();
     }
 
+    protected final GetUnusedBsqAddressRequest createGetUnusedBsqAddressRequest() {
+        return GetUnusedBsqAddressRequest.newBuilder().build();
+    }
+
+    protected final SendBsqRequest createSendBsqRequest(String address, double amount) {
+        return SendBsqRequest.newBuilder().setAddress(address).setAmount(amount).build();
+    }
+
     protected final GetFundingAddressesRequest createGetFundingAddressesRequest() {
         return GetFundingAddressesRequest.newBuilder().build();
     }
@@ -143,8 +173,14 @@ protected final CancelOfferRequest createCancelOfferRequest(String offerId) {
         return CancelOfferRequest.newBuilder().setId(offerId).build();
     }
 
-    protected final TakeOfferRequest createTakeOfferRequest(String offerId, String paymentAccountId) {
-        return TakeOfferRequest.newBuilder().setOfferId(offerId).setPaymentAccountId(paymentAccountId).build();
+    protected final TakeOfferRequest createTakeOfferRequest(String offerId,
+                                                            String paymentAccountId,
+                                                            String takerFeeCurrencyCode) {
+        return TakeOfferRequest.newBuilder()
+                .setOfferId(offerId)
+                .setPaymentAccountId(paymentAccountId)
+                .setTakerFeeCurrencyCode(takerFeeCurrencyCode)
+                .build();
     }
 
     protected final GetTradeRequest createGetTradeRequest(String tradeId) {
@@ -173,9 +209,21 @@ protected final WithdrawFundsRequest createWithdrawFundsRequest(String tradeId,
     }
 
     // Convenience methods for calling frequently used & thoroughly tested gRPC services.
+    protected final BalancesInfo getBalances(BisqAppConfig bisqAppConfig, String currencyCode) {
+        return grpcStubs(bisqAppConfig).walletsService.getBalances(
+                createGetBalancesRequest(currencyCode)).getBalances();
+    }
 
-    protected final long getBalance(BisqAppConfig bisqAppConfig) {
-        return grpcStubs(bisqAppConfig).walletsService.getBalance(createBalanceRequest()).getBalance();
+    protected final BsqBalanceInfo getBsqBalances(BisqAppConfig bisqAppConfig) {
+        return getBalances(bisqAppConfig, "bsq").getBsq();
+    }
+
+    protected final BtcBalanceInfo getBtcBalances(BisqAppConfig bisqAppConfig) {
+        return getBalances(bisqAppConfig, "btc").getBtc();
+    }
+
+    protected final AddressBalanceInfo getAddressBalance(BisqAppConfig bisqAppConfig, String address) {
+        return grpcStubs(bisqAppConfig).walletsService.getAddressBalance(createGetAddressBalanceRequest(address)).getAddressBalanceInfo();
     }
 
     protected final void unlockWallet(BisqAppConfig bisqAppConfig, String password, long timeout) {
@@ -188,6 +236,15 @@ protected final void lockWallet(BisqAppConfig bisqAppConfig) {
         grpcStubs(bisqAppConfig).walletsService.lockWallet(createLockWalletRequest());
     }
 
+    protected final String getUnusedBsqAddress(BisqAppConfig bisqAppConfig) {
+        return grpcStubs(bisqAppConfig).walletsService.getUnusedBsqAddress(createGetUnusedBsqAddressRequest()).getAddress();
+    }
+
+    protected final void sendBsq(BisqAppConfig bisqAppConfig, String address, double amount) {
+        //noinspection ResultOfMethodCallIgnored
+        grpcStubs(bisqAppConfig).walletsService.sendBsq(createSendBsqRequest(address, amount));
+    }
+
     protected final String getUnusedBtcAddress(BisqAppConfig bisqAppConfig) {
         //noinspection OptionalGetWithoutIsPresent
         return grpcStubs(bisqAppConfig).walletsService.getFundingAddresses(createGetFundingAddressesRequest())
@@ -199,6 +256,30 @@ protected final String getUnusedBtcAddress(BisqAppConfig bisqAppConfig) {
                 .getAddress();
     }
 
+    protected final List<PaymentMethod> getPaymentMethods(BisqAppConfig bisqAppConfig) {
+        var req = GetPaymentMethodsRequest.newBuilder().build();
+        return grpcStubs(bisqAppConfig).paymentAccountsService.getPaymentMethods(req).getPaymentMethodsList();
+    }
+
+    protected final File getPaymentAccountForm(BisqAppConfig bisqAppConfig, String paymentMethodId) {
+        // We take seemingly unnecessary steps to get a File object, but the point is to
+        // test the API, and we do not directly ask bisq.core.api.model.PaymentAccountForm
+        // for an empty json form (file).
+        var req = GetPaymentAccountFormRequest.newBuilder()
+                .setPaymentMethodId(paymentMethodId)
+                .build();
+        String jsonString = grpcStubs(bisqAppConfig).paymentAccountsService.getPaymentAccountForm(req)
+                .getPaymentAccountFormJson();
+        // Write the json string to a file here in the test case.
+        File jsonFile = PaymentAccountForm.getTmpJsonFile(paymentMethodId);
+        try (PrintWriter out = new PrintWriter(jsonFile, StandardCharsets.UTF_8)) {
+            out.println(jsonString);
+        } catch (IOException ex) {
+            fail("Could not create tmp payment account form.", ex);
+        }
+        return jsonFile;
+    }
+
     protected final CreatePaymentAccountRequest createCreatePerfectMoneyPaymentAccountRequest(
             String accountName,
             String accountNumber,

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

@@ -73,22 +73,35 @@ public static void setUp() {
     protected final OfferInfo createAliceOffer(PaymentAccount paymentAccount,
                                                String direction,
                                                String currencyCode,
-                                               long amount) {
-        return createMarketBasedPricedOffer(aliceStubs, paymentAccount, direction, currencyCode, amount);
+                                               long amount,
+                                               String makerFeeCurrencyCode) {
+        return createMarketBasedPricedOffer(aliceStubs,
+                paymentAccount,
+                direction,
+                currencyCode,
+                amount,
+                makerFeeCurrencyCode);
     }
 
     protected final OfferInfo createBobOffer(PaymentAccount paymentAccount,
                                              String direction,
                                              String currencyCode,
-                                             long amount) {
-        return createMarketBasedPricedOffer(bobStubs, paymentAccount, direction, currencyCode, amount);
+                                             long amount,
+                                             String makerFeeCurrencyCode) {
+        return createMarketBasedPricedOffer(bobStubs,
+                paymentAccount,
+                direction,
+                currencyCode,
+                amount,
+                makerFeeCurrencyCode);
     }
 
     protected final OfferInfo createMarketBasedPricedOffer(GrpcStubs grpcStubs,
                                                            PaymentAccount paymentAccount,
                                                            String direction,
                                                            String currencyCode,
-                                                           long amount) {
+                                                           long amount,
+                                                           String makerFeeCurrencyCode) {
         var req = CreateOfferRequest.newBuilder()
                 .setPaymentAccountId(paymentAccount.getId())
                 .setDirection(direction)
@@ -99,6 +112,7 @@ protected final OfferInfo createMarketBasedPricedOffer(GrpcStubs grpcStubs,
                 .setMarketPriceMargin(0.00)
                 .setPrice("0")
                 .setBuyerSecurityDeposit(getDefaultBuyerSecurityDepositAsPercent())
+                .setMakerFeeCurrencyCode(makerFeeCurrencyCode)
                 .build();
         return grpcStubs.offersService.createOffer(req).getOffer();
     }