From 206364de42bacb40fd4e9441e1b4018b8ebc342b Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Tue, 29 Dec 2020 14:12:55 -0300
Subject: [PATCH] Reduce some trade test wait times

Commit 2070e76 fixed the repeating dao sync bug, so don't need to
wait as long after generating a btc block.
---
 .../bisq/apitest/method/trade/TakeBuyBTCOfferTest.java | 10 +++++-----
 .../apitest/method/trade/TakeSellBTCOfferTest.java     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java b/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java
index ffbf75ffee..c3935f0340 100644
--- a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java
@@ -79,7 +79,7 @@ public class TakeBuyBTCOfferTest extends AbstractTradeTest {
             // Cache the trade id for the other tests.
             tradeId = trade.getTradeId();
 
-            genBtcBlocksThenWait(1, 2250);
+            genBtcBlocksThenWait(1, 1000);
             assertEquals(0, getOpenOffersCount(aliceStubs, "buy", "usd"));
 
             trade = getTrade(bobdaemon, trade.getTradeId());
@@ -89,7 +89,7 @@ public class TakeBuyBTCOfferTest extends AbstractTradeTest {
             verifyExpectedProtocolStatus(trade);
             logTrade(log, testInfo, "Bob's view after taking offer and sending deposit", trade);
 
-            genBtcBlocksThenWait(1, 2250);
+            genBtcBlocksThenWait(1, 1000);
             trade = getTrade(bobdaemon, trade.getTradeId());
             EXPECTED_PROTOCOL_STATUS.setState(DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN)
                     .setPhase(DEPOSIT_CONFIRMED)
@@ -142,14 +142,14 @@ public class TakeBuyBTCOfferTest extends AbstractTradeTest {
     @Test
     @Order(4)
     public void testAlicesKeepFunds(final TestInfo testInfo) {
-        genBtcBlocksThenWait(1, 2250);
+        genBtcBlocksThenWait(1, 1000);
 
         var trade = getTrade(alicedaemon, tradeId);
         logTrade(log, testInfo, "Alice's view before keeping funds", trade);
 
         keepFunds(alicedaemon, tradeId);
 
-        genBtcBlocksThenWait(1, 2250);
+        genBtcBlocksThenWait(1, 1000);
 
         trade = getTrade(alicedaemon, tradeId);
         EXPECTED_PROTOCOL_STATUS.setState(BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG)
@@ -157,7 +157,7 @@ public class TakeBuyBTCOfferTest extends AbstractTradeTest {
         verifyExpectedProtocolStatus(trade);
         logTrade(log, testInfo, "Alice's view after keeping funds", trade);
         BtcBalanceInfo currentBalance = getBtcBalances(bobdaemon);
-        log.info("{} Alice's current available balance: {} BTC",
+        log.debug("{} Alice's current available balance: {} BTC",
                 testName(testInfo),
                 formatSatoshis(currentBalance.getAvailableBalance()));
     }
diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java b/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java
index 673792c4f5..e56e18cb48 100644
--- a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java
@@ -90,7 +90,7 @@ public class TakeSellBTCOfferTest extends AbstractTradeTest {
 
             logTrade(log, testInfo, "Bob's view after taking offer and sending deposit", trade);
 
-            genBtcBlocksThenWait(1, 2250);
+            genBtcBlocksThenWait(1, 1000);
             trade = getTrade(bobdaemon, trade.getTradeId());
             EXPECTED_PROTOCOL_STATUS.setState(DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN)
                     .setPhase(DEPOSIT_CONFIRMED)
@@ -143,7 +143,7 @@ public class TakeSellBTCOfferTest extends AbstractTradeTest {
     @Test
     @Order(4)
     public void testBobsBtcWithdrawalToExternalAddress(final TestInfo testInfo) {
-        genBtcBlocksThenWait(1, 2250);
+        genBtcBlocksThenWait(1, 1000);
 
         var trade = getTrade(bobdaemon, tradeId);
         logTrade(log, testInfo, "Bob's view before withdrawing funds to external wallet", trade);
@@ -151,7 +151,7 @@ public class TakeSellBTCOfferTest extends AbstractTradeTest {
         String toAddress = bitcoinCli.getNewBtcAddress();
         withdrawFunds(bobdaemon, tradeId, toAddress, WITHDRAWAL_TX_MEMO);
 
-        genBtcBlocksThenWait(1, 2250);
+        genBtcBlocksThenWait(1, 1000);
 
         trade = getTrade(bobdaemon, tradeId);
         EXPECTED_PROTOCOL_STATUS.setState(WITHDRAW_COMPLETED)