Skip to content

Commit

Permalink
Merge pull request #6081 from ghubstan/10-fix-grpcproto-tradeinfo-fie…
Browse files Browse the repository at this point in the history 
…ldnames

Fix 3 misleading .proto TradeInfo field names [#10]
  • Loading branch information
@ripcurlx
ripcurlx committed Feb 28, 2022
2 parents bed0571 + 06c6b0c commit de1c9ba
Show file tree
Hide file tree
Showing 18 changed files with 83 additions and 88 deletions.
10 changes: 5 additions & 5 deletions apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java
View file
Expand Up @@ -133,7 +133,7 @@ protected final void waitForBuyerSeesPaymentInitiatedMessage(Logger log,
String userName = toUserName.apply(grpcClient);
for (int i = 1; i <= maxTradeStateAndPhaseChecks.get(); i++) {
TradeInfo trade = grpcClient.getTrade(tradeId);
if (!trade.getIsFiatSent()) {
if (!trade.getIsPaymentStartedMessageSent()) {
log.warn("{} still waiting for trade {} {}, attempt # {}",
userName,
trade.getShortId(),
Expand All @@ -145,7 +145,7 @@ protected final void waitForBuyerSeesPaymentInitiatedMessage(Logger log,
// it might be AVAILABLE, not OFFER_FEE_PAID.
EXPECTED_PROTOCOL_STATUS.setState(BUYER_SAW_ARRIVED_FIAT_PAYMENT_INITIATED_MSG)
.setPhase(FIAT_SENT)
.setFiatSent(true);
.setPaymentStartedMessageSent(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, userName + "'s view after confirming trade payment sent", trade);
break;
Expand Down Expand Up @@ -194,10 +194,10 @@ protected final void verifyExpectedProtocolStatus(TradeInfo trade) {
assertEquals(EXPECTED_PROTOCOL_STATUS.isDepositPublished, trade.getIsDepositPublished());

assertEquals(EXPECTED_PROTOCOL_STATUS.isDepositConfirmed, trade.getIsDepositConfirmed());
assertEquals(EXPECTED_PROTOCOL_STATUS.isFiatSent, trade.getIsFiatSent());
assertEquals(EXPECTED_PROTOCOL_STATUS.isFiatReceived, trade.getIsFiatReceived());
assertEquals(EXPECTED_PROTOCOL_STATUS.isPaymentStartedMessageSent, trade.getIsPaymentStartedMessageSent());
assertEquals(EXPECTED_PROTOCOL_STATUS.isPaymentReceivedMessageSent, trade.getIsPaymentReceivedMessageSent());
assertEquals(EXPECTED_PROTOCOL_STATUS.isPayoutPublished, trade.getIsPayoutPublished());
assertEquals(EXPECTED_PROTOCOL_STATUS.isWithdrawn, trade.getIsWithdrawn());
assertEquals(EXPECTED_PROTOCOL_STATUS.isCompleted, trade.getIsCompleted());
}

protected final void sendBsqPayment(Logger log,
Expand Down
24 changes: 12 additions & 12 deletions apitest/src/test/java/bisq/apitest/method/trade/ExpectedProtocolStatus.java
View file
Expand Up @@ -11,10 +11,10 @@ public class ExpectedProtocolStatus {
Trade.Phase phase;
boolean isDepositPublished;
boolean isDepositConfirmed;
boolean isFiatSent;
boolean isFiatReceived;
boolean isPaymentStartedMessageSent;
boolean isPaymentReceivedMessageSent;
boolean isPayoutPublished;
boolean isWithdrawn;
boolean isCompleted;

public ExpectedProtocolStatus setState(Trade.State state) {
this.state = state;
Expand All @@ -36,13 +36,13 @@ public ExpectedProtocolStatus setDepositConfirmed(boolean depositConfirmed) {
return this;
}

public ExpectedProtocolStatus setFiatSent(boolean fiatSent) {
isFiatSent = fiatSent;
public ExpectedProtocolStatus setPaymentStartedMessageSent(boolean paymentStartedMessageSent) {
isPaymentStartedMessageSent = paymentStartedMessageSent;
return this;
}

public ExpectedProtocolStatus setFiatReceived(boolean fiatReceived) {
isFiatReceived = fiatReceived;
public ExpectedProtocolStatus setPaymentReceivedMessageSent(boolean paymentReceivedMessageSent) {
isPaymentReceivedMessageSent = paymentReceivedMessageSent;
return this;
}

Expand All @@ -51,8 +51,8 @@ public ExpectedProtocolStatus setPayoutPublished(boolean payoutPublished) {
return this;
}

public ExpectedProtocolStatus setWithdrawn(boolean withdrawn) {
isWithdrawn = withdrawn;
public ExpectedProtocolStatus setCompleted(boolean completed) {
isCompleted = completed;
return this;
}

Expand All @@ -61,9 +61,9 @@ public void init() {
phase = null;
isDepositPublished = false;
isDepositConfirmed = false;
isFiatSent = false;
isFiatReceived = false;
isPaymentStartedMessageSent = false;
isPaymentReceivedMessageSent = false;
isPayoutPublished = false;
isWithdrawn = false;
isCompleted = false;
}
}
2 changes: 1 addition & 1 deletion apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java
View file
Expand Up @@ -145,7 +145,7 @@ public void testAlicesConfirmPaymentReceived(final TestInfo testInfo) {
EXPECTED_PROTOCOL_STATUS.setState(SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG)
.setPhase(PAYOUT_PUBLISHED)
.setPayoutPublished(true)
.setFiatReceived(true);
.setPaymentReceivedMessageSent(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Alice's Maker/Buyer View (Payment Received)", aliceClient.getTrade(tradeId));
logTrade(log, testInfo, "Bob's Taker/Seller View (Payment Received)", bobClient.getTrade(tradeId));
Expand Down
2 changes: 1 addition & 1 deletion apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java
View file
Expand Up @@ -122,7 +122,7 @@ public void testBobsConfirmPaymentReceived(final TestInfo testInfo) {
EXPECTED_PROTOCOL_STATUS.setState(SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG)
.setPhase(PAYOUT_PUBLISHED)
.setPayoutPublished(true)
.setFiatReceived(true);
.setPaymentReceivedMessageSent(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Bob's view after confirming fiat payment received", trade);
} catch (StatusRuntimeException e) {
Expand Down
2 changes: 1 addition & 1 deletion apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java
View file
Expand Up @@ -197,7 +197,7 @@ public void testBobsConfirmPaymentReceived(final TestInfo testInfo) {
EXPECTED_PROTOCOL_STATUS.setState(SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG)
.setPhase(PAYOUT_PUBLISHED)
.setPayoutPublished(true)
.setFiatReceived(true);
.setPaymentReceivedMessageSent(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Bob's view after confirming fiat payment received", trade);
} catch (StatusRuntimeException e) {
Expand Down
2 changes: 1 addition & 1 deletion apitest/src/test/java/bisq/apitest/method/trade/TakeBuyXMROfferTest.java
View file
Expand Up @@ -140,7 +140,7 @@ public void testAlicesConfirmPaymentReceived(final TestInfo testInfo) {
EXPECTED_PROTOCOL_STATUS.setState(SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG)
.setPhase(PAYOUT_PUBLISHED)
.setPayoutPublished(true)
.setFiatReceived(true);
.setPaymentReceivedMessageSent(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Alice's Maker/Buyer View (Payment Received)", aliceClient.getTrade(tradeId));
logTrade(log, testInfo, "Bob's Taker/Seller View (Payment Received)", bobClient.getTrade(tradeId));
Expand Down
4 changes: 2 additions & 2 deletions apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java
View file
Expand Up @@ -138,7 +138,7 @@ public void testBobsConfirmPaymentReceived(final TestInfo testInfo) {
EXPECTED_PROTOCOL_STATUS.setState(SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG)
.setPhase(PAYOUT_PUBLISHED)
.setPayoutPublished(true)
.setFiatReceived(true);
.setPaymentReceivedMessageSent(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Alice's Maker/Seller View (Payment Received)", aliceClient.getTrade(tradeId));
logTrade(log, testInfo, "Bob's Taker/Buyer View (Payment Received)", bobClient.getTrade(tradeId));
Expand Down Expand Up @@ -166,7 +166,7 @@ public void testAlicesBtcWithdrawalToExternalAddress(final TestInfo testInfo) {
trade = aliceClient.getTrade(tradeId);
EXPECTED_PROTOCOL_STATUS.setState(WITHDRAW_COMPLETED)
.setPhase(WITHDRAWN)
.setWithdrawn(true);
.setCompleted(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Alice's Maker/Seller View (Done)", aliceClient.getTrade(tradeId));
logTrade(log, testInfo, "Bob's Taker/Buyer View (Done)", bobClient.getTrade(tradeId));
Expand Down
4 changes: 2 additions & 2 deletions apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java
View file
Expand Up @@ -125,7 +125,7 @@ public void testAlicesConfirmPaymentReceived(final TestInfo testInfo) {
EXPECTED_PROTOCOL_STATUS.setState(SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG)
.setPhase(PAYOUT_PUBLISHED)
.setPayoutPublished(true)
.setFiatReceived(true);
.setPaymentReceivedMessageSent(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Alice's view after confirming fiat payment received", trade);
} catch (StatusRuntimeException e) {
Expand All @@ -148,7 +148,7 @@ public void testBobsBtcWithdrawalToExternalAddress(final TestInfo testInfo) {
trade = bobClient.getTrade(tradeId);
EXPECTED_PROTOCOL_STATUS.setState(WITHDRAW_COMPLETED)
.setPhase(WITHDRAWN)
.setWithdrawn(true);
.setCompleted(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Alice's Maker/Buyer View (Done)", aliceClient.getTrade(tradeId));
logTrade(log, testInfo, "Bob's Taker/Seller View (Done)", bobClient.getTrade(tradeId));
Expand Down
4 changes: 2 additions & 2 deletions apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java
View file
Expand Up @@ -144,7 +144,7 @@ public void testBobsConfirmPaymentReceived(final TestInfo testInfo) {
EXPECTED_PROTOCOL_STATUS.setState(SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG)
.setPhase(PAYOUT_PUBLISHED)
.setPayoutPublished(true)
.setFiatReceived(true);
.setPaymentReceivedMessageSent(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Alice's Maker/Seller View (Payment Received)", aliceClient.getTrade(tradeId));
logTrade(log, testInfo, "Bob's Taker/Buyer View (Payment Received)", bobClient.getTrade(tradeId));
Expand All @@ -170,7 +170,7 @@ public void testAlicesBtcWithdrawalToExternalAddress(final TestInfo testInfo) {
trade = aliceClient.getTrade(tradeId);
EXPECTED_PROTOCOL_STATUS.setState(WITHDRAW_COMPLETED)
.setPhase(WITHDRAWN)
.setWithdrawn(true);
.setCompleted(true);
verifyExpectedProtocolStatus(trade);
logTrade(log, testInfo, "Alice's Maker/Seller View (Done)", aliceClient.getTrade(tradeId));
logTrade(log, testInfo, "Bob's Taker/Buyer View (Done)", bobClient.getTrade(tradeId));
Expand Down
4 changes: 2 additions & 2 deletions apitest/src/test/java/bisq/apitest/scenario/bot/BotClient.java
View file
Expand Up @@ -243,7 +243,7 @@ public boolean isTakerDepositFeeTxConfirmed(String tradeId) {
* @return boolean
*/
public boolean isTradePaymentStartedSent(String tradeId) {
return grpcClient.getTrade(tradeId).getIsFiatSent();
return grpcClient.getTrade(tradeId).getIsPaymentStartedMessageSent();
}

/**
Expand All @@ -252,7 +252,7 @@ public boolean isTradePaymentStartedSent(String tradeId) {
* @return boolean
*/
public boolean isTradePaymentReceivedConfirmationSent(String tradeId) {
return grpcClient.getTrade(tradeId).getIsFiatReceived();
return grpcClient.getTrade(tradeId).getIsPaymentReceivedMessageSent();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions apitest/src/test/java/bisq/apitest/scenario/bot/protocol/BotProtocol.java
View file
Expand Up @@ -133,7 +133,7 @@ protected void printBotProtocolStep() {
checkIfShutdownCalled("Interrupted before checking if 'payment started' message has been sent.");
try {
var t = this.getBotClient().getTrade(trade.getTradeId());
if (t.getIsFiatSent()) {
if (t.getIsPaymentStartedMessageSent()) {
log.info("Buyer has started payment for trade:\n{}",
new TableBuilder(TRADE_DETAIL_TBL, t).build().toString());
return t;
Expand Down Expand Up @@ -168,7 +168,7 @@ protected void printBotProtocolStep() {
checkIfShutdownCalled("Interrupted before checking if 'payment received confirmation' message has been sent.");
try {
var t = this.getBotClient().getTrade(trade.getTradeId());
if (t.getIsFiatReceived()) {
if (t.getIsPaymentReceivedMessageSent()) {
log.info("Seller has received payment for trade:\n{}",
new TableBuilder(TRADE_DETAIL_TBL, t).build().toString());
return t;
Expand Down
13 changes: 6 additions & 7 deletions cli/src/main/java/bisq/cli/table/builder/AbstractTradeListBuilder.java
View file
Expand Up @@ -88,16 +88,15 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder {
@Nullable
protected final Column<Boolean> colIsPayoutPublished;
@Nullable
protected final Column<Boolean> colIsFundsWithdrawn;
protected final Column<Boolean> colIsCompleted;
@Nullable
protected final Column<Long> colBisqTradeFee;
@Nullable
protected final Column<String> colTradeCost;
//protected final Column<Long> colTradeCost;
@Nullable
protected final Column<Boolean> colIsPaymentSent;
protected final Column<Boolean> colIsPaymentStartedMessageSent;
@Nullable
protected final Column<Boolean> colIsPaymentReceived;
protected final Column<Boolean> colIsPaymentReceivedMessageSent;
@Nullable
protected final Column<String> colAltcoinReceiveAddressColumn;

Expand Down Expand Up @@ -139,11 +138,11 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder {
this.colIsDepositPublished = colSupplier.depositPublishedColumn.get();
this.colIsDepositConfirmed = colSupplier.depositConfirmedColumn.get();
this.colIsPayoutPublished = colSupplier.payoutPublishedColumn.get();
this.colIsFundsWithdrawn = colSupplier.fundsWithdrawnColumn.get();
this.colIsCompleted = colSupplier.fundsWithdrawnColumn.get();
this.colBisqTradeFee = colSupplier.bisqTradeDetailFeeColumn.get();
this.colTradeCost = colSupplier.tradeCostColumn.get();
this.colIsPaymentSent = colSupplier.paymentSentColumn.get();
this.colIsPaymentReceived = colSupplier.paymentReceivedColumn.get();
this.colIsPaymentStartedMessageSent = colSupplier.paymentStartedMessageSentColumn.get();
this.colIsPaymentReceivedMessageSent = colSupplier.paymentReceivedMessageSentColumn.get();
//noinspection ConstantConditions
this.colAltcoinReceiveAddressColumn = colSupplier.altcoinReceiveAddressColumn.get();

Expand Down
12 changes: 6 additions & 6 deletions cli/src/main/java/bisq/cli/table/builder/TradeDetailTableBuilder.java
View file
Expand Up @@ -83,10 +83,10 @@ private void populateBisqV1TradeColumns(TradeInfo trade) {
colIsDepositPublished.addRow(trade.getIsDepositPublished());
colIsDepositConfirmed.addRow(trade.getIsDepositConfirmed());
colTradeCost.addRow(toTradeVolumeAsString.apply(trade));
colIsPaymentSent.addRow(trade.getIsFiatSent());
colIsPaymentReceived.addRow(trade.getIsFiatReceived());
colIsPaymentStartedMessageSent.addRow(trade.getIsPaymentStartedMessageSent());
colIsPaymentReceivedMessageSent.addRow(trade.getIsPaymentReceivedMessageSent());
colIsPayoutPublished.addRow(trade.getIsPayoutPublished());
colIsFundsWithdrawn.addRow(trade.getIsWithdrawn());
colIsCompleted.addRow(trade.getIsCompleted());
if (colAltcoinReceiveAddressColumn != null)
colAltcoinReceiveAddressColumn.addRow(toAltcoinReceiveAddress.apply(trade));
}
Expand Down Expand Up @@ -126,10 +126,10 @@ private List<Column<?>> getBisqV1TradeColumnList() {
add(colIsDepositPublished.asStringColumn());
add(colIsDepositConfirmed.asStringColumn());
add(colTradeCost.justify());
add(colIsPaymentSent.asStringColumn());
add(colIsPaymentReceived.asStringColumn());
add(colIsPaymentStartedMessageSent.asStringColumn());
add(colIsPaymentReceivedMessageSent.asStringColumn());
add(colIsPayoutPublished.asStringColumn());
add(colIsFundsWithdrawn.asStringColumn());
add(colIsCompleted.asStringColumn());
}};

if (colAltcoinReceiveAddressColumn != null)
Expand Down
4 changes: 2 additions & 2 deletions cli/src/main/java/bisq/cli/table/builder/TradeTableColumnSupplier.java
View file
Expand Up @@ -226,7 +226,7 @@ public TradeTableColumnSupplier(TableType tableType, List<TradeInfo> trades) {
? t.getOffer().getCounterCurrencyCode()
: t.getOffer().getBaseCurrencyCode();

final Supplier<Column<Boolean>> paymentSentColumn = () -> {
final Supplier<Column<Boolean>> paymentStartedMessageSentColumn = () -> {
if (isTradeDetailTblBuilder.get()) {
String headerCurrencyCode = toPaymentCurrencyCode.apply(firstRow.get());
String colHeader = format(COL_HEADER_TRADE_PAYMENT_SENT, headerCurrencyCode);
Expand All @@ -236,7 +236,7 @@ public TradeTableColumnSupplier(TableType tableType, List<TradeInfo> trades) {
}
};

final Supplier<Column<Boolean>> paymentReceivedColumn = () -> {
final Supplier<Column<Boolean>> paymentReceivedMessageSentColumn = () -> {
if (isTradeDetailTblBuilder.get()) {
String headerCurrencyCode = toPaymentCurrencyCode.apply(firstRow.get());
String colHeader = format(COL_HEADER_TRADE_PAYMENT_RECEIVED, headerCurrencyCode);
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/bisq/core/api/model/CanceledTradeInfo.java
View file
Expand Up @@ -60,10 +60,10 @@ public static TradeInfo toCanceledTradeInfo(OpenOffer myCanceledOpenOffer) {
.withTradePeriodState("") // Ignored
.withIsDepositPublished(false) // Ignored
.withIsDepositConfirmed(false) // Ignored
.withIsFiatSent(false) // Ignored
.withIsFiatReceived(false) // Ignored
.withIsPaymentStartedMessageSent(false) // Ignored
.withIsPaymentReceivedMessageSent(false) // Ignored
.withIsPayoutPublished(false) // Ignored
.withIsWithdrawn(false) // Ignored
.withIsCompleted(false) // Ignored
.withContractAsJson("") // Ignored
.withContract(emptyContract.get()) // Ignored
.withClosingStatus(capitalize(CANCELED.name().toLowerCase()))
Expand Down

0 comments on commit de1c9ba

Please sign in to comment.