From 6026e6fb78aa2bd194613530485b8c40ca581873 Mon Sep 17 00:00:00 2001 From: AllyKaz Date: Fri, 2 Jun 2023 14:43:13 +0100 Subject: [PATCH] xRemove hardcoding of enableBisqDebugging in ApiTest Remove hardcoding of value to prevent it being set as a command line option that then overides the option being set from apitest.properties file preventing it from being altered without altering code. Redundant as false is the default. --- apitest/src/test/java/bisq/apitest/ApiTestCase.java | 3 +-- .../apitest/method/CallRateMeteringInterceptorTest.java | 1 - .../src/test/java/bisq/apitest/method/MethodTest.java | 9 ++------- .../bisq/apitest/method/offer/AbstractOfferTest.java | 5 ----- .../java/bisq/apitest/method/offer/BsqSwapOfferTest.java | 4 ---- .../trade/TakeBuyBTCOfferWithNationalBankAcctTest.java | 4 ---- .../bisq/apitest/method/trade/TakeSellXMROfferTest.java | 2 +- .../java/bisq/apitest/method/wallet/BsqWalletTest.java | 1 - .../bisq/apitest/method/wallet/BtcTxFeeRateTest.java | 1 - .../java/bisq/apitest/method/wallet/BtcWalletTest.java | 1 - .../src/test/java/bisq/apitest/scenario/OfferTest.java | 5 ----- .../src/test/java/bisq/apitest/scenario/StartupTest.java | 1 - .../src/test/java/bisq/apitest/scenario/WalletTest.java | 1 - 13 files changed, 4 insertions(+), 34 deletions(-) diff --git a/apitest/src/test/java/bisq/apitest/ApiTestCase.java b/apitest/src/test/java/bisq/apitest/ApiTestCase.java index 315561cbb6..97732712f2 100644 --- a/apitest/src/test/java/bisq/apitest/ApiTestCase.java +++ b/apitest/src/test/java/bisq/apitest/ApiTestCase.java @@ -87,8 +87,7 @@ public class ApiTestCase { throws InterruptedException, ExecutionException, IOException { String[] params = new String[]{ "--supportingApps", stream(supportingApps).map(Enum::name).collect(Collectors.joining(",")), - "--callRateMeteringConfigPath", getTestRateMeterInterceptorConfig().getAbsolutePath(), - "--enableBisqDebugging", "false" + "--callRateMeteringConfigPath", getTestRateMeterInterceptorConfig().getAbsolutePath() }; setUpScaffold(params); } diff --git a/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java b/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java index f7a076a9f9..e26ee2548c 100644 --- a/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java +++ b/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java @@ -45,7 +45,6 @@ public class CallRateMeteringInterceptorTest extends MethodTest { @BeforeAll public static void setUp() { startSupportingApps(false, - false, bitcoind, alicedaemon); } diff --git a/apitest/src/test/java/bisq/apitest/method/MethodTest.java b/apitest/src/test/java/bisq/apitest/method/MethodTest.java index 8ac98eee75..a1afd5c99f 100644 --- a/apitest/src/test/java/bisq/apitest/method/MethodTest.java +++ b/apitest/src/test/java/bisq/apitest/method/MethodTest.java @@ -70,13 +70,11 @@ public class MethodTest extends ApiTestCase { public static void startSupportingApps(File callRateMeteringConfigFile, boolean generateBtcBlock, - boolean startSupportingAppsInDebugMode, Enum... supportingApps) { try { setUpScaffold(new String[]{ "--supportingApps", toNameList.apply(supportingApps), "--callRateMeteringConfigPath", callRateMeteringConfigFile.getAbsolutePath(), - "--enableBisqDebugging", startSupportingAppsInDebugMode ? "true" : "false" }); doPostStartup(generateBtcBlock); } catch (Exception ex) { @@ -84,16 +82,13 @@ public class MethodTest extends ApiTestCase { } } - public static void startSupportingApps(boolean generateBtcBlock, - boolean startSupportingAppsInDebugMode, - Enum... supportingApps) { + public static void startSupportingApps(boolean generateBtcBlock, Enum... supportingApps) { try { // Disable call rate metering where there is no callRateMeteringConfigFile. File callRateMeteringConfigFile = getTestRateMeterInterceptorConfig(); setUpScaffold(new String[]{ "--supportingApps", toNameList.apply(supportingApps), - "--callRateMeteringConfigPath", callRateMeteringConfigFile.getAbsolutePath(), - "--enableBisqDebugging", startSupportingAppsInDebugMode ? "true" : "false" + "--callRateMeteringConfigPath", callRateMeteringConfigFile.getAbsolutePath() }); doPostStartup(generateBtcBlock); } catch (Exception ex) { diff --git a/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java b/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java index 627c1befe3..2275d1b003 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java +++ b/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java @@ -77,12 +77,7 @@ public abstract class AbstractOfferTest extends MethodTest { @BeforeAll public static void setUp() { - setUp(false); - } - - public static void setUp(boolean startSupportingAppsInDebugMode) { startSupportingApps(true, - startSupportingAppsInDebugMode, bitcoind, seednode, arbdaemon, diff --git a/apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java b/apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java index e1824f8c91..81022eaf57 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java +++ b/apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java @@ -44,10 +44,6 @@ import static protobuf.OfferDirection.BUY; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class BsqSwapOfferTest extends AbstractOfferTest { - @BeforeAll - public static void setUp() { - AbstractOfferTest.setUp(false); - } @BeforeEach public void generateBtcBlock() { diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java b/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java index 9c1a1f99eb..2d51648d96 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java +++ b/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java @@ -78,10 +78,6 @@ public class TakeBuyBTCOfferWithNationalBankAcctTest extends AbstractTradeTest { private static PaymentAccount alicesPaymentAccount; private static PaymentAccount bobsPaymentAccount; - @BeforeAll - public static void setUp() { - setUp(false); - } @Test @Order(1) diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java b/apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java index ad9162d09a..ef322d7e18 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java +++ b/apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java @@ -60,7 +60,7 @@ public class TakeSellXMROfferTest extends AbstractTradeTest { @BeforeAll public static void setUp() { - AbstractOfferTest.setUp(false); + AbstractOfferTest.setUp(); createXmrPaymentAccounts(); EXPECTED_PROTOCOL_STATUS.init(); } diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/BsqWalletTest.java b/apitest/src/test/java/bisq/apitest/method/wallet/BsqWalletTest.java index 010f0fe0d2..757bcd2844 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/BsqWalletTest.java +++ b/apitest/src/test/java/bisq/apitest/method/wallet/BsqWalletTest.java @@ -48,7 +48,6 @@ public class BsqWalletTest extends MethodTest { @BeforeAll public static void setUp() { startSupportingApps(true, - false, bitcoind, seednode, arbdaemon, diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java b/apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java index 1925b4452c..ff3861b589 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java +++ b/apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java @@ -36,7 +36,6 @@ public class BtcTxFeeRateTest extends MethodTest { @BeforeAll public static void setUp() { startSupportingApps(false, - true, bitcoind, seednode, alicedaemon); diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java b/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java index 59eeab906a..00de34c0c0 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java +++ b/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java @@ -41,7 +41,6 @@ public class BtcWalletTest extends MethodTest { @BeforeAll public static void setUp() { startSupportingApps(false, - false, bitcoind, seednode, alicedaemon, diff --git a/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java b/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java index 492378c3e5..558108b15a 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java +++ b/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java @@ -43,11 +43,6 @@ import bisq.apitest.method.offer.ValidateCreateOfferTest; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class OfferTest extends AbstractOfferTest { - @BeforeAll - public static void setUp() { - setUp(false); // Use setUp(true) for running API daemons in remote debug mode. - } - @Test @Order(1) public void testCreateOfferValidation() { diff --git a/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java b/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java index 74df4f78a5..d0bb08087a 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java +++ b/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java @@ -57,7 +57,6 @@ public class StartupTest extends MethodTest { try { callRateMeteringConfigFile = getTestRateMeterInterceptorConfig(); startSupportingApps(callRateMeteringConfigFile, - false, false, bitcoind, seednode, arbdaemon, alicedaemon); } catch (Exception ex) { diff --git a/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java b/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java index 17b88eca5b..ae8fe053c5 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java +++ b/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java @@ -53,7 +53,6 @@ public class WalletTest extends MethodTest { @BeforeAll public static void setUp() { startSupportingApps(true, - false, bitcoind, seednode, arbdaemon,