mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-13 11:09:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Minor formatting, rename a method

Browse source
This commit is contained in:
ghubstan 2022-06-14 08:49:45 -03:00
parent 7570671994
commit 87cce9053f
No known key found for this signature in database
GPG key ID: E35592D6800A861E
8 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java
View file

@ -43,10 +43,16 @@ public class AbstractTradeTest extends AbstractOfferTest {
@Getter @Getter
protected static String tradeId; protected static String tradeId;
protected final Supplier<Integer> maxTradeStateAndPhaseChecks = () -> isLongRunningTest ? 10 : 2; protected final Supplier<Integer> maxTradeStateAndPhaseChecks = () ->
isLongRunningTest
? 10
: 2;
protected final Function<TradeInfo, String> toTradeDetailTable = (trade) -> protected final Function<TradeInfo, String> toTradeDetailTable = (trade) ->
new TableBuilder(TRADE_DETAIL_TBL, trade).build().toString(); new TableBuilder(TRADE_DETAIL_TBL, trade).build().toString();
protected final Function<GrpcClient, String> toUserName = (client) -> client.equals(aliceClient) ? "Alice" : "Bob"; protected final Function<GrpcClient, String> toUserName = (client) ->
client.equals(aliceClient)
? "Alice"
: "Bob";
@BeforeAll @BeforeAll
public static void initStaticFixtures() { public static void initStaticFixtures() {
@ -87,17 +93,17 @@ public class AbstractTradeTest extends AbstractOfferTest {
return trade; return trade;
} }
protected final void waitForDepositConfirmation(Logger log, protected final void waitForTakerDepositConfirmation(Logger log,
TestInfo testInfo, TestInfo testInfo,
GrpcClient grpcClient, GrpcClient takerClient,
String tradeId) { String tradeId) {
Predicate<TradeInfo> isTradeInDepositConfirmedStateAndPhase = (t) -> Predicate<TradeInfo> isTradeInDepositConfirmedStateAndPhase = (t) ->
t.getState().equals(DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN.name()) t.getState().equals(DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN.name())
&& t.getPhase().equals(DEPOSIT_CONFIRMED.name()); && t.getPhase().equals(DEPOSIT_CONFIRMED.name());
String userName = toUserName.apply(grpcClient); String userName = toUserName.apply(takerClient);
for (int i = 1; i <= maxTradeStateAndPhaseChecks.get(); i++) { for (int i = 1; i <= maxTradeStateAndPhaseChecks.get(); i++) {
TradeInfo trade = grpcClient.getTrade(tradeId); TradeInfo trade = takerClient.getTrade(tradeId);
if (!isTradeInDepositConfirmedStateAndPhase.test(trade)) { if (!isTradeInDepositConfirmedStateAndPhase.test(trade)) {
log.warn("{} still waiting on trade {} tx {}: DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN, attempt # {}", log.warn("{} still waiting on trade {} tx {}: DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN, attempt # {}",
userName, userName,

2
apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java
View file

@ -101,7 +101,7 @@ public class TakeBuyBSQOfferTest extends AbstractTradeTest {
alicesBsqOffers = aliceClient.getMyOffersSortedByDate(BSQ); alicesBsqOffers = aliceClient.getMyOffersSortedByDate(BSQ);
assertEquals(0, alicesBsqOffers.size()); assertEquals(0, alicesBsqOffers.size());
waitForDepositConfirmation(log, testInfo, bobClient, trade.getTradeId()); waitForTakerDepositConfirmation(log, testInfo, bobClient, trade.getTradeId());
genBtcBlocksThenWait(1, 2_500); genBtcBlocksThenWait(1, 2_500);
trade = bobClient.getTrade(tradeId); trade = bobClient.getTrade(tradeId);

4
apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java
View file

@ -108,7 +108,7 @@ public class TakeBuyBTCOfferTest extends AbstractTradeTest {
// Now generate the BTC block to confirm the taker deposit tx. // Now generate the BTC block to confirm the taker deposit tx.
genBtcBlocksThenWait(1, 2_500); genBtcBlocksThenWait(1, 2_500);
waitForDepositConfirmation(log, testInfo, bobClient, tradeId); waitForTakerDepositConfirmation(log, testInfo, bobClient, tradeId);
// Verify the seller can only send a payment rcvd msg after the payment started msg. // Verify the seller can only send a payment rcvd msg after the payment started msg.
verifyPaymentReceivedMsgAfterPaymentSentMsgPrecondition(log, bobClient); verifyPaymentReceivedMsgAfterPaymentSentMsgPrecondition(log, bobClient);
@ -122,7 +122,7 @@ public class TakeBuyBTCOfferTest extends AbstractTradeTest {
public void testAlicesConfirmPaymentStarted(final TestInfo testInfo) { public void testAlicesConfirmPaymentStarted(final TestInfo testInfo) {
try { try {
var trade = aliceClient.getTrade(tradeId); var trade = aliceClient.getTrade(tradeId);
waitForDepositConfirmation(log, testInfo, aliceClient, trade.getTradeId()); waitForTakerDepositConfirmation(log, testInfo, aliceClient, trade.getTradeId());
aliceClient.confirmPaymentStarted(trade.getTradeId()); aliceClient.confirmPaymentStarted(trade.getTradeId());
sleep(6_000); sleep(6_000);
waitUntilBuyerSeesPaymentStartedMessage(log, testInfo, aliceClient, tradeId); waitUntilBuyerSeesPaymentStartedMessage(log, testInfo, aliceClient, tradeId);

4
apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java
View file

@ -145,7 +145,7 @@ public class TakeBuyBTCOfferWithNationalBankAcctTest extends AbstractTradeTest {
alicesOffers = aliceClient.getMyOffersSortedByDate(BUY.name(), BRL); alicesOffers = aliceClient.getMyOffersSortedByDate(BUY.name(), BRL);
assertEquals(0, alicesOffers.size()); assertEquals(0, alicesOffers.size());
genBtcBlocksThenWait(1, 2_500); genBtcBlocksThenWait(1, 2_500);
waitForDepositConfirmation(log, testInfo, bobClient, trade.getTradeId()); waitForTakerDepositConfirmation(log, testInfo, bobClient, trade.getTradeId());
trade = bobClient.getTrade(tradeId); trade = bobClient.getTrade(tradeId);
verifyTakerDepositConfirmed(trade); verifyTakerDepositConfirmed(trade);
@ -182,7 +182,7 @@ public class TakeBuyBTCOfferWithNationalBankAcctTest extends AbstractTradeTest {
public void testAlicesConfirmPaymentStarted(final TestInfo testInfo) { public void testAlicesConfirmPaymentStarted(final TestInfo testInfo) {
try { try {
var trade = aliceClient.getTrade(tradeId); var trade = aliceClient.getTrade(tradeId);
waitForDepositConfirmation(log, testInfo, aliceClient, trade.getTradeId()); waitForTakerDepositConfirmation(log, testInfo, aliceClient, trade.getTradeId());
aliceClient.confirmPaymentStarted(trade.getTradeId()); aliceClient.confirmPaymentStarted(trade.getTradeId());
sleep(6_000); sleep(6_000);
waitUntilBuyerSeesPaymentStartedMessage(log, testInfo, aliceClient, tradeId); waitUntilBuyerSeesPaymentStartedMessage(log, testInfo, aliceClient, tradeId);

2
apitest/src/test/java/bisq/apitest/method/trade/TakeBuyXMROfferTest.java
View file

@ -115,7 +115,7 @@ public class TakeBuyXMROfferTest extends AbstractTradeTest {
// Now generate the BTC block to confirm the taker deposit tx. // Now generate the BTC block to confirm the taker deposit tx.
genBtcBlocksThenWait(1, 2_500); genBtcBlocksThenWait(1, 2_500);
waitForDepositConfirmation(log, testInfo, bobClient, tradeId); waitForTakerDepositConfirmation(log, testInfo, bobClient, tradeId);
// Verify the seller can only send a payment rcvd msg after the payment started msg. // Verify the seller can only send a payment rcvd msg after the payment started msg.
verifyPaymentReceivedMsgAfterPaymentSentMsgPrecondition(log, aliceClient); verifyPaymentReceivedMsgAfterPaymentSentMsgPrecondition(log, aliceClient);

6
apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java
View file

@ -82,7 +82,7 @@ public class TakeSellBSQOfferTest extends AbstractTradeTest {
alicesLegacyBsqAcct.getId(), alicesLegacyBsqAcct.getId(),
TRADE_FEE_CURRENCY_CODE); 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); genBtcBlocksThenWait(1, 2_500);
var offerId = alicesOffer.getId(); var offerId = alicesOffer.getId();
assertTrue(alicesOffer.getIsCurrencyForMakerFeeBtc()); assertTrue(alicesOffer.getIsCurrencyForMakerFeeBtc());
var alicesBsqOffers = aliceClient.getMyOffers(btcTradeDirection, BSQ); var alicesBsqOffers = aliceClient.getMyOffers(btcTradeDirection, BSQ);
@ -95,7 +95,7 @@ public class TakeSellBSQOfferTest extends AbstractTradeTest {
alicesBsqOffers = aliceClient.getMyOffersSortedByDate(BSQ); alicesBsqOffers = aliceClient.getMyOffersSortedByDate(BSQ);
assertEquals(0, alicesBsqOffers.size()); assertEquals(0, alicesBsqOffers.size());
genBtcBlocksThenWait(1, 2_500); genBtcBlocksThenWait(1, 2_500);
waitForDepositConfirmation(log, testInfo, bobClient, trade.getTradeId()); waitForTakerDepositConfirmation(log, testInfo, bobClient, trade.getTradeId());
trade = bobClient.getTrade(tradeId); trade = bobClient.getTrade(tradeId);
verifyTakerDepositConfirmed(trade); verifyTakerDepositConfirmed(trade);
logTrade(log, testInfo, "Alice's Maker/Seller View", aliceClient.getTrade(tradeId)); logTrade(log, testInfo, "Alice's Maker/Seller View", aliceClient.getTrade(tradeId));
@ -110,7 +110,7 @@ public class TakeSellBSQOfferTest extends AbstractTradeTest {
public void testAlicesConfirmPaymentStarted(final TestInfo testInfo) { public void testAlicesConfirmPaymentStarted(final TestInfo testInfo) {
try { try {
var trade = aliceClient.getTrade(tradeId); var trade = aliceClient.getTrade(tradeId);
waitForDepositConfirmation(log, testInfo, aliceClient, trade.getTradeId()); waitForTakerDepositConfirmation(log, testInfo, aliceClient, trade.getTradeId());
sendBsqPayment(log, aliceClient, trade); sendBsqPayment(log, aliceClient, trade);
genBtcBlocksThenWait(1, 2_500); genBtcBlocksThenWait(1, 2_500);
aliceClient.confirmPaymentStarted(trade.getTradeId()); aliceClient.confirmPaymentStarted(trade.getTradeId());

2
apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java
View file

@ -112,7 +112,7 @@ public class TakeSellBTCOfferTest extends AbstractTradeTest {
// Now generate the BTC block to confirm the taker deposit tx. // Now generate the BTC block to confirm the taker deposit tx.
genBtcBlocksThenWait(1, 2_500); genBtcBlocksThenWait(1, 2_500);
waitForDepositConfirmation(log, testInfo, bobClient, tradeId); waitForTakerDepositConfirmation(log, testInfo, bobClient, tradeId);
// Verify the seller can only send a payment rcvd msg after the payment started msg. // Verify the seller can only send a payment rcvd msg after the payment started msg.
verifyPaymentReceivedMsgAfterPaymentSentMsgPrecondition(log, aliceClient); verifyPaymentReceivedMsgAfterPaymentSentMsgPrecondition(log, aliceClient);

6
apitest/src/test/java/bisq/apitest/method/trade/TakeSellXMROfferTest.java
View file

@ -118,7 +118,7 @@ public class TakeSellXMROfferTest extends AbstractTradeTest {
// Now generate the BTC block to confirm the taker deposit tx. // Now generate the BTC block to confirm the taker deposit tx.
genBtcBlocksThenWait(1, 2_500); genBtcBlocksThenWait(1, 2_500);
waitForDepositConfirmation(log, testInfo, bobClient, tradeId); waitForTakerDepositConfirmation(log, testInfo, bobClient, tradeId);
// Verify the seller can only send a payment rcvd msg after the payment started msg. // Verify the seller can only send a payment rcvd msg after the payment started msg.
verifyPaymentReceivedMsgAfterPaymentSentMsgPrecondition(log, bobClient); verifyPaymentReceivedMsgAfterPaymentSentMsgPrecondition(log, bobClient);
@ -132,10 +132,10 @@ public class TakeSellXMROfferTest extends AbstractTradeTest {
public void testAlicesConfirmPaymentStarted(final TestInfo testInfo) { public void testAlicesConfirmPaymentStarted(final TestInfo testInfo) {
try { try {
var trade = aliceClient.getTrade(tradeId); var trade = aliceClient.getTrade(tradeId);
waitForDepositConfirmation(log, testInfo, aliceClient, trade.getTradeId()); waitForTakerDepositConfirmation(log, testInfo, aliceClient, trade.getTradeId());
log.debug("Alice sends XMR payment to Bob for trade {}", trade.getTradeId()); log.debug("Alice sends XMR payment to Bob for trade {}", trade.getTradeId());
aliceClient.confirmPaymentStarted(trade.getTradeId()); aliceClient.confirmPaymentStarted(trade.getTradeId());
sleep(3500); sleep(3_500);
waitUntilBuyerSeesPaymentStartedMessage(log, testInfo, aliceClient, tradeId); waitUntilBuyerSeesPaymentStartedMessage(log, testInfo, aliceClient, tradeId);
logTrade(log, testInfo, "Alice's Maker/Seller View (Payment Sent)", aliceClient.getTrade(tradeId)); logTrade(log, testInfo, "Alice's Maker/Seller View (Payment Sent)", aliceClient.getTrade(tradeId));