From 15f75eea3d1d0dda0a586e7c07496960294c8b04 Mon Sep 17 00:00:00 2001 From: ghubstan <36207203+ghubstan@users.noreply.github.com> Date: Fri, 18 Feb 2022 16:49:51 -0300 Subject: [PATCH] Add some asserts on volume/min-volume strings from server --- .../method/offer/CreateBSQOffersTest.java | 28 +++++++++++++++---- .../offer/CreateOfferUsingFixedPriceTest.java | 18 ++++++++++-- ...CreateOfferUsingMarketPriceMarginTest.java | 10 +++---- .../method/trade/AbstractTradeTest.java | 12 +++++--- .../method/trade/TakeBuyBSQOfferTest.java | 2 +- .../method/trade/TakeSellBSQOfferTest.java | 2 +- 6 files changed, 52 insertions(+), 20 deletions(-) diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java b/apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java index 57b318e68e..2b878c1803 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java +++ b/apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java @@ -66,7 +66,7 @@ public class CreateBSQOffersTest extends AbstractOfferTest { getDefaultBuyerSecurityDepositAsPercent(), alicesLegacyBsqAcct.getId(), MAKER_FEE_CURRENCY_CODE); - log.debug("Sell BSQ (Buy BTC) OFFER:\n{}", toOfferTable.apply(newOffer)); + log.debug("Sell BSQ (Buy BTC) Offer:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -77,6 +77,8 @@ public class CreateBSQOffersTest extends AbstractOfferTest { assertEquals("0.00005000", newOffer.getPrice()); assertEquals(100_000_000L, newOffer.getAmount()); assertEquals(100_000_000L, newOffer.getMinAmount()); + assertEquals("20000.00", newOffer.getVolume()); + assertEquals("20000.00", newOffer.getMinVolume()); assertEquals(15_000_000, newOffer.getBuyerSecurityDeposit()); assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId()); assertEquals(BSQ, newOffer.getBaseCurrencyCode()); @@ -94,6 +96,8 @@ public class CreateBSQOffersTest extends AbstractOfferTest { assertEquals("0.00005000", newOffer.getPrice()); assertEquals(100_000_000L, newOffer.getAmount()); assertEquals(100_000_000L, newOffer.getMinAmount()); + assertEquals("20000.00", newOffer.getVolume()); + assertEquals("20000.00", newOffer.getMinVolume()); assertEquals(15_000_000, newOffer.getBuyerSecurityDeposit()); assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId()); assertEquals(BSQ, newOffer.getBaseCurrencyCode()); @@ -113,7 +117,7 @@ public class CreateBSQOffersTest extends AbstractOfferTest { getDefaultBuyerSecurityDepositAsPercent(), alicesLegacyBsqAcct.getId(), MAKER_FEE_CURRENCY_CODE); - log.debug("SELL 20K BSQ OFFER:\n{}", toOfferTable.apply(newOffer)); + log.debug("SELL 20K BSQ Offer:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -124,6 +128,8 @@ public class CreateBSQOffersTest extends AbstractOfferTest { assertEquals("0.00005000", newOffer.getPrice()); assertEquals(100_000_000L, newOffer.getAmount()); assertEquals(100_000_000L, newOffer.getMinAmount()); + assertEquals("20000.00", newOffer.getVolume()); + assertEquals("20000.00", newOffer.getMinVolume()); assertEquals(15_000_000, newOffer.getBuyerSecurityDeposit()); assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId()); assertEquals(BSQ, newOffer.getBaseCurrencyCode()); @@ -141,6 +147,8 @@ public class CreateBSQOffersTest extends AbstractOfferTest { assertEquals("0.00005000", newOffer.getPrice()); assertEquals(100_000_000L, newOffer.getAmount()); assertEquals(100_000_000L, newOffer.getMinAmount()); + assertEquals("20000.00", newOffer.getVolume()); + assertEquals("20000.00", newOffer.getMinVolume()); assertEquals(15_000_000, newOffer.getBuyerSecurityDeposit()); assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId()); assertEquals(BSQ, newOffer.getBaseCurrencyCode()); @@ -160,7 +168,7 @@ public class CreateBSQOffersTest extends AbstractOfferTest { getDefaultBuyerSecurityDepositAsPercent(), alicesLegacyBsqAcct.getId(), MAKER_FEE_CURRENCY_CODE); - log.debug("BUY 1-2K BSQ OFFER:\n{}", toOfferTable.apply(newOffer)); + log.debug("BUY 1-2K BSQ Offer:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -171,6 +179,8 @@ public class CreateBSQOffersTest extends AbstractOfferTest { assertEquals("0.00005000", newOffer.getPrice()); assertEquals(10_000_000L, newOffer.getAmount()); assertEquals(5_000_000L, newOffer.getMinAmount()); + assertEquals("2000.00", newOffer.getVolume()); + assertEquals("1000.00", newOffer.getMinVolume()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId()); assertEquals(BSQ, newOffer.getBaseCurrencyCode()); @@ -188,6 +198,8 @@ public class CreateBSQOffersTest extends AbstractOfferTest { assertEquals("0.00005000", newOffer.getPrice()); assertEquals(10_000_000L, newOffer.getAmount()); assertEquals(5_000_000L, newOffer.getMinAmount()); + assertEquals("2000.00", newOffer.getVolume()); + assertEquals("1000.00", newOffer.getMinVolume()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId()); assertEquals(BSQ, newOffer.getBaseCurrencyCode()); @@ -207,7 +219,7 @@ public class CreateBSQOffersTest extends AbstractOfferTest { getDefaultBuyerSecurityDepositAsPercent(), alicesLegacyBsqAcct.getId(), MAKER_FEE_CURRENCY_CODE); - log.debug("SELL 5-10K BSQ OFFER:\n{}", toOfferTable.apply(newOffer)); + log.debug("SELL 5-10K BSQ Offer:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -218,6 +230,8 @@ public class CreateBSQOffersTest extends AbstractOfferTest { assertEquals("0.00005000", newOffer.getPrice()); assertEquals(50_000_000L, newOffer.getAmount()); assertEquals(25_000_000L, newOffer.getMinAmount()); + assertEquals("10000.00", newOffer.getVolume()); + assertEquals("5000.00", newOffer.getMinVolume()); assertEquals(7_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId()); assertEquals(BSQ, newOffer.getBaseCurrencyCode()); @@ -235,6 +249,8 @@ public class CreateBSQOffersTest extends AbstractOfferTest { assertEquals("0.00005000", newOffer.getPrice()); assertEquals(50_000_000L, newOffer.getAmount()); assertEquals(25_000_000L, newOffer.getMinAmount()); + assertEquals("10000.00", newOffer.getVolume()); + assertEquals("5000.00", newOffer.getMinVolume()); assertEquals(7_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId()); assertEquals(BSQ, newOffer.getBaseCurrencyCode()); @@ -246,7 +262,7 @@ public class CreateBSQOffersTest extends AbstractOfferTest { @Order(5) public void testGetAllMyBsqOffers() { List offers = aliceClient.getMyCryptoCurrencyOffersSortedByDate(BSQ); - log.debug("ALL ALICE'S BSQ OFFERS:\n{}", toOffersTable.apply(offers)); + log.debug("All Alice's BSQ Offers:\n{}", toOffersTable.apply(offers)); assertEquals(4, offers.size()); log.debug("ALICE'S BALANCES\n{}", formatBalancesTbls(aliceClient.getBalances())); } @@ -255,7 +271,7 @@ public class CreateBSQOffersTest extends AbstractOfferTest { @Order(6) public void testGetAvailableBsqOffers() { List offers = bobClient.getCryptoCurrencyOffersSortedByDate(BSQ); - log.debug("ALL BOB'S AVAILABLE BSQ OFFERS:\n{}", toOffersTable.apply(offers)); + log.debug("All Bob's Available BSQ Offers:\n{}", toOffersTable.apply(offers)); assertEquals(4, offers.size()); log.debug("BOB'S BALANCES\n{}", formatBalancesTbls(bobClient.getBalances())); } diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java b/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java index fb921a2cbd..794fb1310a 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java +++ b/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java @@ -58,7 +58,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { getDefaultBuyerSecurityDepositAsPercent(), audAccount.getId(), MAKER_FEE_CURRENCY_CODE); - log.debug("OFFER #1:\n{}", toOfferTable.apply(newOffer)); + log.debug("Offer #1:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -69,6 +69,8 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals("36000.0000", newOffer.getPrice()); assertEquals(10_000_000, newOffer.getAmount()); assertEquals(10_000_000, newOffer.getMinAmount()); + assertEquals("3600", newOffer.getVolume()); + assertEquals("3600", newOffer.getMinVolume()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(audAccount.getId(), newOffer.getPaymentAccountId()); assertEquals(BTC, newOffer.getBaseCurrencyCode()); @@ -84,6 +86,8 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals("36000.0000", newOffer.getPrice()); assertEquals(10_000_000, newOffer.getAmount()); assertEquals(10_000_000, newOffer.getMinAmount()); + assertEquals("3600", newOffer.getVolume()); + assertEquals("3600", newOffer.getMinVolume()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(audAccount.getId(), newOffer.getPaymentAccountId()); assertEquals(BTC, newOffer.getBaseCurrencyCode()); @@ -103,7 +107,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { getDefaultBuyerSecurityDepositAsPercent(), usdAccount.getId(), MAKER_FEE_CURRENCY_CODE); - log.debug("OFFER #2:\n{}", toOfferTable.apply(newOffer)); + log.debug("Offer #2:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -114,6 +118,8 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals("30000.1234", newOffer.getPrice()); assertEquals(10_000_000, newOffer.getAmount()); assertEquals(10_000_000, newOffer.getMinAmount()); + assertEquals("3000", newOffer.getVolume()); + assertEquals("3000", newOffer.getMinVolume()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(usdAccount.getId(), newOffer.getPaymentAccountId()); assertEquals(BTC, newOffer.getBaseCurrencyCode()); @@ -129,6 +135,8 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals("30000.1234", newOffer.getPrice()); assertEquals(10_000_000, newOffer.getAmount()); assertEquals(10_000_000, newOffer.getMinAmount()); + assertEquals("3000", newOffer.getVolume()); + assertEquals("3000", newOffer.getMinVolume()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(usdAccount.getId(), newOffer.getPaymentAccountId()); assertEquals(BTC, newOffer.getBaseCurrencyCode()); @@ -148,7 +156,7 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { getDefaultBuyerSecurityDepositAsPercent(), eurAccount.getId(), MAKER_FEE_CURRENCY_CODE); - log.debug("OFFER #3:\n{}", toOfferTable.apply(newOffer)); + log.debug("Offer #3:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -159,6 +167,8 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals("29500.1234", newOffer.getPrice()); assertEquals(10_000_000, newOffer.getAmount()); assertEquals(5_000_000, newOffer.getMinAmount()); + assertEquals("2950", newOffer.getVolume()); + assertEquals("1475", newOffer.getMinVolume()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(eurAccount.getId(), newOffer.getPaymentAccountId()); assertEquals(BTC, newOffer.getBaseCurrencyCode()); @@ -174,6 +184,8 @@ public class CreateOfferUsingFixedPriceTest extends AbstractOfferTest { assertEquals("29500.1234", newOffer.getPrice()); assertEquals(10_000_000, newOffer.getAmount()); assertEquals(5_000_000, newOffer.getMinAmount()); + assertEquals("2950", newOffer.getVolume()); + assertEquals("1475", newOffer.getMinVolume()); assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit()); assertEquals(eurAccount.getId(), newOffer.getPaymentAccountId()); assertEquals(BTC, newOffer.getBaseCurrencyCode()); diff --git a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java b/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java index 2dd32d44d3..7ad241f50c 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java +++ b/apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java @@ -75,7 +75,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { usdAccount.getId(), MAKER_FEE_CURRENCY_CODE, NO_TRIGGER_PRICE); - log.debug("OFFER #1:\n{}", toOfferTable.apply(newOffer)); + log.debug("Offer #1:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -122,7 +122,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { nzdAccount.getId(), MAKER_FEE_CURRENCY_CODE, NO_TRIGGER_PRICE); - log.debug("OFFER #2:\n{}", toOfferTable.apply(newOffer)); + log.debug("Offer #2:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -169,7 +169,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { gbpAccount.getId(), MAKER_FEE_CURRENCY_CODE, NO_TRIGGER_PRICE); - log.debug("OFFER #3:\n{}", toOfferTable.apply(newOffer)); + log.debug("Offer #3:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -216,7 +216,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { brlAccount.getId(), MAKER_FEE_CURRENCY_CODE, NO_TRIGGER_PRICE); - log.debug("OFFER #4:\n{}", toOfferTable.apply(newOffer)); + log.debug("Offer #4:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertTrue(newOffer.getIsMyPendingOffer()); @@ -269,7 +269,7 @@ public class CreateOfferUsingMarketPriceMarginTest extends AbstractOfferTest { genBtcBlocksThenWait(1, 4000); // give time to add to offer book newOffer = aliceClient.getOffer(newOffer.getId()); - log.debug("OFFER #5:\n{}", toOfferTable.apply(newOffer)); + log.debug("Offer #5:\n{}", toOfferTable.apply(newOffer)); assertTrue(newOffer.getIsMyOffer()); assertFalse(newOffer.getIsMyPendingOffer()); assertEquals(triggerPrice, newOffer.getTriggerPrice()); diff --git a/apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java b/apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java index 5ceebe026a..5ea52777c6 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java +++ b/apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java @@ -14,7 +14,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.TestInfo; import static bisq.apitest.config.ApiTestConfig.BTC; -import static bisq.cli.CurrencyFormat.formatBsqAmount; import static bisq.cli.table.builder.TableType.TRADE_DETAIL_TBL; import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED; import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT; @@ -208,7 +207,10 @@ public class AbstractTradeTest extends AbstractOfferTest { String receiverAddress = contract.getIsBuyerMakerAndSellerTaker() ? contract.getTakerPaymentAccountPayload().getAddress() : contract.getMakerPaymentAccountPayload().getAddress(); - String sendBsqAmount = formatBsqAmount(trade.getOffer().getVolume()); + // TODO Fix trade vol src bug for subclasses. + // This bug was fixed for production CLI with https://github.com/bisq-network/bisq/pull/5704 on Sep 27, 2021 + String sendBsqAmount = trade.getOffer().getVolume(); + // String sendBsqAmount = trade.getTradeVolume(); log.debug("Sending {} BSQ to address {}", sendBsqAmount, receiverAddress); grpcClient.sendBsq(receiverAddress, sendBsqAmount, ""); } @@ -217,8 +219,10 @@ public class AbstractTradeTest extends AbstractOfferTest { GrpcClient grpcClient, TradeInfo trade) { var contract = trade.getContract(); - var bsqSats = trade.getOffer().getVolume(); - var receiveAmountAsString = formatBsqAmount(bsqSats); + // TODO Fix trade vol src bug for subclasses. + // This bug was fixed for production with https://github.com/bisq-network/bisq/pull/5704 on Sep 27, 2021 + var receiveAmountAsString = trade.getOffer().getVolume(); + // String receiveAmountAsString = trade.getTradeVolume(); var address = contract.getIsBuyerMakerAndSellerTaker() ? contract.getTakerPaymentAccountPayload().getAddress() : contract.getMakerPaymentAccountPayload().getAddress(); diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java b/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java index 6a37a3d121..50bde49e24 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java +++ b/apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java @@ -79,7 +79,7 @@ public class TakeBuyBSQOfferTest extends AbstractTradeTest { getDefaultBuyerSecurityDepositAsPercent(), alicesLegacyBsqAcct.getId(), TRADE_FEE_CURRENCY_CODE); - log.debug("ALICE'S BUY BSQ (SELL BTC) OFFER:\n{}", toOfferTable.apply(alicesOffer)); + log.debug("Alice's BUY BSQ (SELL BTC) Offer:\n{}", toOfferTable.apply(alicesOffer)); genBtcBlocksThenWait(1, 5000); var offerId = alicesOffer.getId(); assertFalse(alicesOffer.getIsCurrencyForMakerFeeBtc()); diff --git a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java b/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java index f4411c5178..ac1f056915 100644 --- a/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java +++ b/apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java @@ -81,7 +81,7 @@ public class TakeSellBSQOfferTest extends AbstractTradeTest { getDefaultBuyerSecurityDepositAsPercent(), alicesLegacyBsqAcct.getId(), TRADE_FEE_CURRENCY_CODE); - log.debug("ALICE'S SELL BSQ (BUY BTC) OFFER:\n{}", new TableBuilder(OFFER_TBL, alicesOffer).build()); + log.debug("Alice's SELL BSQ (BUY BTC) Offer:\n{}", new TableBuilder(OFFER_TBL, alicesOffer).build()); genBtcBlocksThenWait(1, 4_000); var offerId = alicesOffer.getId(); assertTrue(alicesOffer.getIsCurrencyForMakerFeeBtc());