Merge branch 'master' into remove_awt_dependencies

bisq-network · Jan 7, 2021 · e50a182 · e50a182
2 parents 64d0926 + 76e2330
commit e50a182
Show file tree

Hide file tree

Showing 221 changed files with 5,565 additions and 3,103 deletions.
diff --git a/apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java b/apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java
@@ -59,7 +59,7 @@ public void start() throws InterruptedException, IOException {
                 + " -rpcport=" + config.bitcoinRpcPort
                 + " -rpcuser=" + config.bitcoinRpcUser
                 + " -rpcpassword=" + config.bitcoinRpcPassword
-                + " -blocknotify=" + config.bitcoinDatadir + "/blocknotify";
+                + " -blocknotify=" + "\"" + config.bitcoinDatadir + "/blocknotify" + " %s\"";
 
         BashCommand cmd = new BashCommand(bitcoindCmd).run();
         log.info("Starting ...\n$ {}", cmd.getCommand());

diff --git a/apitest/src/test/java/bisq/apitest/ApiTestCase.java b/apitest/src/test/java/bisq/apitest/ApiTestCase.java
@@ -19,7 +19,6 @@
 
 import java.net.InetAddress;
 
-import java.io.File;
 import java.io.IOException;
 
 import java.util.HashMap;
@@ -73,16 +72,6 @@ public class ApiTestCase {
     // gRPC service stubs are used by method & scenario tests, but not e2e tests.
     private static final Map<BisqAppConfig, GrpcStubs> grpcStubsCache = new HashMap<>();
 
-    public static void setUpScaffold(File callRateMeteringConfigFile,
-                                     Enum<?>... supportingApps)
-            throws InterruptedException, ExecutionException, IOException {
-        scaffold = new Scaffold(stream(supportingApps).map(Enum::name)
-                .collect(Collectors.joining(",")))
-                .setUp();
-        config = scaffold.config;
-        bitcoinCli = new BitcoinCliHelper((config));
-    }
-
     public static void setUpScaffold(Enum<?>... supportingApps)
             throws InterruptedException, ExecutionException, IOException {
         scaffold = new Scaffold(stream(supportingApps).map(Enum::name)
@@ -107,6 +96,10 @@ public static void tearDownScaffold() {
         scaffold.tearDown();
     }
 
+    protected static String getEnumArrayAsString(Enum<?>[] supportingApps) {
+        return stream(supportingApps).map(Enum::name).collect(Collectors.joining(","));
+    }
+
     protected static GrpcStubs grpcStubs(BisqAppConfig bisqAppConfig) {
         if (grpcStubsCache.containsKey(bisqAppConfig)) {
             return grpcStubsCache.get(bisqAppConfig);

diff --git a/apitest/src/test/java/bisq/apitest/method/MethodTest.java b/apitest/src/test/java/bisq/apitest/method/MethodTest.java
@@ -19,6 +19,7 @@
 
 import bisq.core.api.model.PaymentAccountForm;
 import bisq.core.api.model.TxFeeRateInfo;
+import bisq.core.payment.F2FAccount;
 import bisq.core.proto.CoreProtoResolver;
 
 import bisq.common.util.Utilities;
@@ -34,6 +35,7 @@
 import bisq.proto.grpc.GetAddressBalanceRequest;
 import bisq.proto.grpc.GetBalancesRequest;
 import bisq.proto.grpc.GetFundingAddressesRequest;
+import bisq.proto.grpc.GetMyOfferRequest;
 import bisq.proto.grpc.GetOfferRequest;
 import bisq.proto.grpc.GetPaymentAccountFormRequest;
 import bisq.proto.grpc.GetPaymentAccountsRequest;
@@ -133,9 +135,9 @@ public static void startSupportingApps(boolean registerDisputeAgents,
         }
     }
 
-    private static void doPostStartup(boolean registerDisputeAgents,
-                                      boolean generateBtcBlock,
-                                      Enum<?>... supportingApps) {
+    protected static void doPostStartup(boolean registerDisputeAgents,
+                                        boolean generateBtcBlock,
+                                        Enum<?>... supportingApps) {
         if (registerDisputeAgents) {
             registerDisputeAgents(arbdaemon);
         }
@@ -223,6 +225,10 @@ protected final GetOfferRequest createGetOfferRequest(String offerId) {
         return GetOfferRequest.newBuilder().setId(offerId).build();
     }
 
+    protected final GetMyOfferRequest createGetMyOfferRequest(String offerId) {
+        return GetMyOfferRequest.newBuilder().setId(offerId).build();
+    }
+
     protected final CancelOfferRequest createCancelOfferRequest(String offerId) {
         return CancelOfferRequest.newBuilder().setId(offerId).build();
     }
@@ -401,6 +407,11 @@ protected final OfferInfo getOffer(BisqAppConfig bisqAppConfig, String offerId)
         return grpcStubs(bisqAppConfig).offersService.getOffer(req).getOffer();
     }
 
+    protected final OfferInfo getMyOffer(BisqAppConfig bisqAppConfig, String offerId) {
+        var req = createGetMyOfferRequest(offerId);
+        return grpcStubs(bisqAppConfig).offersService.getMyOffer(req).getOffer();
+    }
+
     @SuppressWarnings("ResultOfMethodCallIgnored")
     protected final void cancelOffer(BisqAppConfig bisqAppConfig, String offerId) {
         var req = createCancelOfferRequest(offerId);
@@ -464,6 +475,21 @@ protected final TxInfo getTransaction(BisqAppConfig bisqAppConfig, String txId)
         return grpcStubs(bisqAppConfig).walletsService.getTransaction(req).getTxInfo();
     }
 
+    public bisq.core.payment.PaymentAccount createDummyF2FAccount(BisqAppConfig bisqAppConfig,
+                                                                  String countryCode) {
+        String f2fAccountJsonString = "{\n" +
+                "  \"_COMMENTS_\": \"This is a dummy account.\",\n" +
+                "  \"paymentMethodId\": \"F2F\",\n" +
+                "  \"accountName\": \"Dummy " + countryCode.toUpperCase() + " F2F Account\",\n" +
+                "  \"city\": \"Anytown\",\n" +
+                "  \"contact\": \"Morse Code\",\n" +
+                "  \"country\": \"" + countryCode.toUpperCase() + "\",\n" +
+                "  \"extraInfo\": \"Salt Lick #213\"\n" +
+                "}\n";
+        F2FAccount f2FAccount = (F2FAccount) createPaymentAccount(bisqAppConfig, f2fAccountJsonString);
+        return f2FAccount;
+    }
+
     // Static conveniences for test methods and test case fixture setups.
 
     protected static RegisterDisputeAgentRequest createRegisterDisputeAgentRequest(String disputeAgentType) {

diff --git a/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java b/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java
@@ -18,13 +18,13 @@
 package bisq.apitest.method.offer;
 
 import bisq.core.monetary.Altcoin;
+import bisq.core.payment.PaymentAccount;
 
 import bisq.proto.grpc.CreateOfferRequest;
+import bisq.proto.grpc.GetMyOffersRequest;
 import bisq.proto.grpc.GetOffersRequest;
 import bisq.proto.grpc.OfferInfo;
 
-import protobuf.PaymentAccount;
-
 import org.bitcoinj.utils.Fiat;
 
 import java.math.BigDecimal;
@@ -121,6 +121,10 @@ protected final OfferInfo getOffer(String offerId) {
         return aliceStubs.offersService.getOffer(createGetOfferRequest(offerId)).getOffer();
     }
 
+    protected final OfferInfo getMyOffer(String offerId) {
+        return aliceStubs.offersService.getMyOffer(createGetMyOfferRequest(offerId)).getOffer();
+    }
+
     @SuppressWarnings("ResultOfMethodCallIgnored")
     protected final void cancelOffer(GrpcStubs grpcStubs, String offerId) {
         grpcStubs.offersService.cancelOffer(createCancelOfferRequest(offerId));
@@ -134,18 +138,26 @@ protected final OfferInfo getMostRecentOffer(GrpcStubs grpcStubs, String directi
         return offerInfoList.get(offerInfoList.size() - 1);
     }
 
-    protected final int getOpenOffersCount(GrpcStubs grpcStubs, String direction, String currencyCode) {
-        return getOffersSortedByDate(grpcStubs, direction, currencyCode).size();
-    }
-
-    protected final List<OfferInfo> getOffersSortedByDate(GrpcStubs grpcStubs, String direction, String currencyCode) {
+    protected final List<OfferInfo> getOffersSortedByDate(GrpcStubs grpcStubs,
+                                                          String direction,
+                                                          String currencyCode) {
         var req = GetOffersRequest.newBuilder()
                 .setDirection(direction)
                 .setCurrencyCode(currencyCode).build();
         var reply = grpcStubs.offersService.getOffers(req);
         return sortOffersByDate(reply.getOffersList());
     }
 
+    protected final List<OfferInfo> getMyOffersSortedByDate(GrpcStubs grpcStubs,
+                                                            String direction,
+                                                            String currencyCode) {
+        var req = GetMyOffersRequest.newBuilder()
+                .setDirection(direction)
+                .setCurrencyCode(currencyCode).build();
+        var reply = grpcStubs.offersService.getMyOffers(req);
+        return sortOffersByDate(reply.getOffersList());
+    }
+
     protected final List<OfferInfo> sortOffersByDate(List<OfferInfo> offerInfoList) {
         return offerInfoList.stream()
                 .sorted(comparing(OfferInfo::getDate))

diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CancelOfferTest.java b/apitest/src/test/java/bisq/apitest/method/offer/CancelOfferTest.java
@@ -18,6 +18,7 @@
 package bisq.apitest.method.offer;
 
 import bisq.core.btc.wallet.Restrictions;
+import bisq.core.payment.PaymentAccount;
 
 import bisq.proto.grpc.CreateOfferRequest;
 import bisq.proto.grpc.OfferInfo;
@@ -32,22 +33,26 @@
 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;
 
 @Disabled
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class CancelOfferTest extends AbstractOfferTest {
 
+    private static final String DIRECTION = "buy";
+    private static final String CURRENCY_CODE = "cad";
     private static final int MAX_OFFERS = 3;
 
     @Test
     @Order(1)
     public void testCancelOffer() {
+        PaymentAccount cadAccount = createDummyF2FAccount(alicedaemon, "CA");
         var req = CreateOfferRequest.newBuilder()
-                .setPaymentAccountId(alicesDummyAcct.getId())
-                .setDirection("buy")
-                .setCurrencyCode("cad")
+                .setPaymentAccountId(cadAccount.getId())
+                .setDirection(DIRECTION)
+                .setCurrencyCode(CURRENCY_CODE)
                 .setAmount(10000000)
                 .setMinAmount(10000000)
                 .setUseMarketBasedPrice(true)
@@ -66,18 +71,19 @@ public void testCancelOffer() {
             sleep(2500);
         }
 
-        List<OfferInfo> offers = getOffersSortedByDate(aliceStubs, "buy", "cad");
+        List<OfferInfo> offers = getMyOffersSortedByDate(aliceStubs, DIRECTION, CURRENCY_CODE);
         assertEquals(MAX_OFFERS, offers.size());
 
         // Cancel the offers, checking the open offer count after each offer removal.
         for (int i = 1; i <= MAX_OFFERS; i++) {
             cancelOffer(aliceStubs, offers.remove(0).getId());
-            assertEquals(MAX_OFFERS - i, getOpenOffersCount(aliceStubs, "buy", "cad"));
+            offers = getMyOffersSortedByDate(aliceStubs, DIRECTION, CURRENCY_CODE);
+            assertEquals(MAX_OFFERS - i, offers.size());
         }
 
         sleep(1000);  // wait for offer removal
 
-        offers = getOffersSortedByDate(aliceStubs, "buy", "cad");
+        offers = getMyOffersSortedByDate(aliceStubs, DIRECTION, CURRENCY_CODE);
         assertEquals(0, offers.size());
     }
 }