Skip to content

Commit

Permalink
Merge pull request bisq-network#6060 from ghubstan/4-change-grpc-prot…
Browse files Browse the repository at this point in the history 
…o-volume-to-string

Change API OfferInfo volume/minVolume proto fields to string [#4]
  • Loading branch information
@ripcurlx
ripcurlx authored Feb 28, 2022
2 parents 068fedb + 1a3622b commit 532efcc
Show file tree
Hide file tree
Showing 14 changed files with 143 additions and 111 deletions.
28 changes: 22 additions & 6 deletions apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void testCreateBuy1BTCFor20KBSQOffer() {
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());

Expand All @@ -77,6 +77,8 @@ public void testCreateBuy1BTCFor20KBSQOffer() {
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());
Expand All @@ -94,6 +96,8 @@ public void testCreateBuy1BTCFor20KBSQOffer() {
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());
Expand All @@ -113,7 +117,7 @@ public void testCreateSell1BTCFor20KBSQOffer() {
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());

Expand All @@ -124,6 +128,8 @@ public void testCreateSell1BTCFor20KBSQOffer() {
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());
Expand All @@ -141,6 +147,8 @@ public void testCreateSell1BTCFor20KBSQOffer() {
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());
Expand All @@ -160,7 +168,7 @@ public void testCreateBuyBTCWith1To2KBSQOffer() {
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());

Expand All @@ -171,6 +179,8 @@ public void testCreateBuyBTCWith1To2KBSQOffer() {
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());
Expand All @@ -188,6 +198,8 @@ public void testCreateBuyBTCWith1To2KBSQOffer() {
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());
Expand All @@ -207,7 +219,7 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
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());

Expand All @@ -218,6 +230,8 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
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());
Expand All @@ -235,6 +249,8 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
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());
Expand All @@ -246,7 +262,7 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
@Order(5)
public void testGetAllMyBsqOffers() {
List<OfferInfo> 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()));
}
Expand All @@ -255,7 +271,7 @@ public void testGetAllMyBsqOffers() {
@Order(6)
public void testGetAvailableBsqOffers() {
List<OfferInfo> 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()));
}
Expand Down
18 changes: 15 additions & 3 deletions apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() {
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());

Expand All @@ -69,6 +69,8 @@ public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() {
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());
Expand All @@ -84,6 +86,8 @@ public void testCreateAUDBTCBuyOfferUsingFixedPrice16000() {
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());
Expand All @@ -103,7 +107,7 @@ public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() {
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());

Expand All @@ -114,6 +118,8 @@ public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() {
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());
Expand All @@ -129,6 +135,8 @@ public void testCreateUSDBTCBuyOfferUsingFixedPrice100001234() {
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());
Expand All @@ -148,7 +156,7 @@ public void testCreateEURBTCSellOfferUsingFixedPrice95001234() {
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());

Expand All @@ -159,6 +167,8 @@ public void testCreateEURBTCSellOfferUsingFixedPrice95001234() {
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());
Expand All @@ -174,6 +184,8 @@ public void testCreateEURBTCSellOfferUsingFixedPrice95001234() {
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());
Expand Down
10 changes: 5 additions & 5 deletions apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void testCreateUSDBTCBuyOffer5PctPriceMargin() {
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());

Expand Down Expand Up @@ -122,7 +122,7 @@ public void testCreateNZDBTCBuyOfferMinus2PctPriceMargin() {
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());

Expand Down Expand Up @@ -169,7 +169,7 @@ public void testCreateGBPBTCSellOfferMinus1Point5PctPriceMargin() {
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());

Expand Down Expand Up @@ -216,7 +216,7 @@ public void testCreateBRLBTCSellOffer6Point55PctPriceMargin() {
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());

Expand Down Expand Up @@ -269,7 +269,7 @@ public void testCreateUSDBTCBuyOfferWithTriggerPrice() {

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());
Expand Down
12 changes: 8 additions & 4 deletions apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
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;
Expand Down Expand Up @@ -208,7 +207,10 @@ protected final void sendBsqPayment(Logger log,
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, "");
}
Expand All @@ -217,8 +219,10 @@ protected final void verifyBsqPaymentHasBeenReceived(Logger log,
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();
Expand Down
2 changes: 1 addition & 1 deletion apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void testTakeAlicesSellBTCForBSQOffer(final TestInfo testInfo) {
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());
Expand Down
2 changes: 1 addition & 1 deletion apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void testTakeAlicesBuyBTCForBSQOffer(final TestInfo testInfo) {
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());
Expand Down
Loading

0 comments on commit 532efcc

Please sign in to comment.