Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove apitest's create bsq-swap account method #5811

Merged
merged 3 commits into from
Nov 9, 2021
Merged

Remove apitest's create bsq-swap account method #5811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb234bf
Remove apitest's create bsq-swap account method
ghubstan Nov 5, 2021
531db1e
Do not publish altcoin acct age witness data
ghubstan Nov 7, 2021
edd0141
Remove fields/methods/logic for creating redundant bsq-swap accounts
ghubstan Nov 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,11 @@ public abstract class AbstractOfferTest extends MethodTest {
@Setter
protected static boolean isLongRunningTest;

protected static PaymentAccount alicesBsqAcct;
protected static PaymentAccount bobsBsqAcct;
protected static PaymentAccount alicesBsqSwapAcct;
protected static PaymentAccount bobsBsqSwapAcct;
// TODO Deprecate legacy BSQ accounts when no longer in use.
protected static PaymentAccount alicesLegacyBsqAcct;
protected static PaymentAccount bobsLegacyBsqAcct;

@BeforeAll
public static void setUp() {
Expand All @@ -64,17 +67,8 @@ public static void setUp() {
arbdaemon,
alicedaemon,
bobdaemon);
}

public static void createBsqSwapBsqPaymentAccounts() {
alicesBsqAcct = aliceClient.createCryptoCurrencyPaymentAccount("Alice's BsqSwap Account",
BSQ,
aliceClient.getUnusedBsqAddress(), // TODO refactor, bsq address not needed for atom acct
false);
bobsBsqAcct = bobClient.createCryptoCurrencyPaymentAccount("Bob's BsqSwap Account",
BSQ,
bobClient.getUnusedBsqAddress(), // TODO refactor, bsq address not needed for atom acct
false);
initSwapPaymentAccounts();
}

// Mkt Price Margin value of offer returned from server is scaled down by 10^-2.
Expand Down Expand Up @@ -105,13 +99,20 @@ public static void createBsqSwapBsqPaymentAccounts() {
return priceAsBigDecimal.toPlainString();
};

public static void initSwapPaymentAccounts() {
// A bot may not know what the default 'BSQ Swap' account name is,
// but API test cases do: the value of the i18n property 'BSQ_SWAP'.
alicesBsqSwapAcct = aliceClient.getPaymentAccount("BSQ Swap");
bobsBsqSwapAcct = bobClient.getPaymentAccount("BSQ Swap");
}

@SuppressWarnings("ConstantConditions")
public static void createBsqPaymentAccounts() {
alicesBsqAcct = aliceClient.createCryptoCurrencyPaymentAccount("Alice's BSQ Account",
public static void createLegacyBsqPaymentAccounts() {
alicesLegacyBsqAcct = aliceClient.createCryptoCurrencyPaymentAccount("Alice's Legacy BSQ Account",
BSQ,
aliceClient.getUnusedBsqAddress(),
false);
bobsBsqAcct = bobClient.createCryptoCurrencyPaymentAccount("Bob's BSQ Account",
bobsLegacyBsqAcct = bobClient.createCryptoCurrencyPaymentAccount("Bob's Legacy BSQ Account",
BSQ,
bobClient.getUnusedBsqAddress(),
false);
Expand Down
3 changes: 1 addition & 2 deletions apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public class BsqSwapOfferTest extends AbstractOfferTest {
@BeforeAll
public static void setUp() {
AbstractOfferTest.setUp();
createBsqSwapBsqPaymentAccounts();
}

@BeforeEach
Expand Down Expand Up @@ -115,7 +114,7 @@ private void createBsqSwapOffer() {
1_000_000L,
1_000_000L,
"0.00005",
alicesBsqAcct.getId());
alicesBsqSwapAcct.getId());
log.debug("BsqSwap Sell BSQ (Buy BTC) OFFER:\n{}", bsqSwapOffer);
var newOfferId = bsqSwapOffer.getId();
assertNotEquals("", newOfferId);
Expand Down
26 changes: 13 additions & 13 deletions apitest/src/test/java/bisq/apitest/method/offer/CreateBSQOffersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class CreateBSQOffersTest extends AbstractOfferTest {
@BeforeAll
public static void setUp() {
AbstractOfferTest.setUp();
createBsqPaymentAccounts();
createLegacyBsqPaymentAccounts();
}

@Test
Expand All @@ -68,7 +68,7 @@ public void testCreateBuy1BTCFor20KBSQOffer() {
100_000_000L,
"0.00005", // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
MAKER_FEE_CURRENCY_CODE);
log.info("Sell BSQ (Buy BTC) OFFER:\n{}", formatOfferTable(singletonList(newOffer), BSQ));
assertTrue(newOffer.getIsMyOffer());
Expand All @@ -82,7 +82,7 @@ public void testCreateBuy1BTCFor20KBSQOffer() {
assertEquals(100_000_000L, newOffer.getAmount());
assertEquals(100_000_000L, newOffer.getMinAmount());
assertEquals(15_000_000, newOffer.getBuyerSecurityDeposit());
assertEquals(alicesBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(BSQ, newOffer.getBaseCurrencyCode());
assertEquals(BTC, newOffer.getCounterCurrencyCode());
assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
Expand All @@ -99,7 +99,7 @@ public void testCreateBuy1BTCFor20KBSQOffer() {
assertEquals(100_000_000L, newOffer.getAmount());
assertEquals(100_000_000L, newOffer.getMinAmount());
assertEquals(15_000_000, newOffer.getBuyerSecurityDeposit());
assertEquals(alicesBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(BSQ, newOffer.getBaseCurrencyCode());
assertEquals(BTC, newOffer.getCounterCurrencyCode());
assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
Expand All @@ -115,7 +115,7 @@ public void testCreateSell1BTCFor20KBSQOffer() {
100_000_000L,
"0.00005", // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
MAKER_FEE_CURRENCY_CODE);
log.info("SELL 20K BSQ OFFER:\n{}", formatOfferTable(singletonList(newOffer), BSQ));
assertTrue(newOffer.getIsMyOffer());
Expand All @@ -129,7 +129,7 @@ public void testCreateSell1BTCFor20KBSQOffer() {
assertEquals(100_000_000L, newOffer.getAmount());
assertEquals(100_000_000L, newOffer.getMinAmount());
assertEquals(15_000_000, newOffer.getBuyerSecurityDeposit());
assertEquals(alicesBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(BSQ, newOffer.getBaseCurrencyCode());
assertEquals(BTC, newOffer.getCounterCurrencyCode());
assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
Expand All @@ -146,7 +146,7 @@ public void testCreateSell1BTCFor20KBSQOffer() {
assertEquals(100_000_000L, newOffer.getAmount());
assertEquals(100_000_000L, newOffer.getMinAmount());
assertEquals(15_000_000, newOffer.getBuyerSecurityDeposit());
assertEquals(alicesBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(BSQ, newOffer.getBaseCurrencyCode());
assertEquals(BTC, newOffer.getCounterCurrencyCode());
assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
Expand All @@ -162,7 +162,7 @@ public void testCreateBuyBTCWith1To2KBSQOffer() {
5_000_000L,
"0.00005", // FIXED PRICE IN BTC sats FOR 1 BSQ
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
MAKER_FEE_CURRENCY_CODE);
log.info("BUY 1-2K BSQ OFFER:\n{}", formatOfferTable(singletonList(newOffer), BSQ));
assertTrue(newOffer.getIsMyOffer());
Expand All @@ -176,7 +176,7 @@ public void testCreateBuyBTCWith1To2KBSQOffer() {
assertEquals(10_000_000L, newOffer.getAmount());
assertEquals(5_000_000L, newOffer.getMinAmount());
assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit());
assertEquals(alicesBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(BSQ, newOffer.getBaseCurrencyCode());
assertEquals(BTC, newOffer.getCounterCurrencyCode());
assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
Expand All @@ -193,7 +193,7 @@ public void testCreateBuyBTCWith1To2KBSQOffer() {
assertEquals(10_000_000L, newOffer.getAmount());
assertEquals(5_000_000L, newOffer.getMinAmount());
assertEquals(1_500_000, newOffer.getBuyerSecurityDeposit());
assertEquals(alicesBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(BSQ, newOffer.getBaseCurrencyCode());
assertEquals(BTC, newOffer.getCounterCurrencyCode());
assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
Expand All @@ -209,7 +209,7 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
25_000_000L,
"0.00005", // FIXED PRICE IN BTC sats FOR 1 BSQ
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
MAKER_FEE_CURRENCY_CODE);
log.info("SELL 5-10K BSQ OFFER:\n{}", formatOfferTable(singletonList(newOffer), BSQ));
assertTrue(newOffer.getIsMyOffer());
Expand All @@ -223,7 +223,7 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
assertEquals(50_000_000L, newOffer.getAmount());
assertEquals(25_000_000L, newOffer.getMinAmount());
assertEquals(7_500_000, newOffer.getBuyerSecurityDeposit());
assertEquals(alicesBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(BSQ, newOffer.getBaseCurrencyCode());
assertEquals(BTC, newOffer.getCounterCurrencyCode());
assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
Expand All @@ -240,7 +240,7 @@ public void testCreateSellBTCFor5To10KBSQOffer() {
assertEquals(50_000_000L, newOffer.getAmount());
assertEquals(25_000_000L, newOffer.getMinAmount());
assertEquals(7_500_000, newOffer.getBuyerSecurityDeposit());
assertEquals(alicesBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(alicesLegacyBsqAcct.getId(), newOffer.getPaymentAccountId());
assertEquals(BSQ, newOffer.getBaseCurrencyCode());
assertEquals(BTC, newOffer.getCounterCurrencyCode());
assertFalse(newOffer.getIsCurrencyForMakerFeeBtc());
Expand Down
20 changes: 10 additions & 10 deletions apitest/src/test/java/bisq/apitest/method/offer/EditOfferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,14 +427,14 @@ public void testChangePriceMarginBasedOfferToFixedPriceOfferAndDeactivateIt() {
@Test
@Order(13)
public void testChangeFixedPricedBsqOfferToPriceMarginBasedOfferShouldThrowException() {
createBsqPaymentAccounts();
createLegacyBsqPaymentAccounts();
OfferInfo originalOffer = aliceClient.createFixedPricedOffer(BUY.name(),
BSQ,
100_000_000L,
100_000_000L,
"0.00005", // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
BSQ);
log.info("ORIGINAL BSQ OFFER:\n{}", formatOfferTable(singletonList(originalOffer), "BSQ"));
genBtcBlocksThenWait(1, 2500); // Wait for offer book entry.
Expand All @@ -455,14 +455,14 @@ public void testChangeFixedPricedBsqOfferToPriceMarginBasedOfferShouldThrowExcep
@Test
@Order(14)
public void testEditTriggerPriceOnFixedPriceBsqOfferShouldThrowException() {
createBsqPaymentAccounts();
createLegacyBsqPaymentAccounts();
OfferInfo originalOffer = aliceClient.createFixedPricedOffer(BUY.name(),
BSQ,
100_000_000L,
100_000_000L,
"0.00005", // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
BSQ);
log.info("ORIGINAL BSQ OFFER:\n{}", formatOfferTable(singletonList(originalOffer), "BSQ"));
genBtcBlocksThenWait(1, 2500); // Wait for offer book entry.
Expand All @@ -484,15 +484,15 @@ public void testEditTriggerPriceOnFixedPriceBsqOfferShouldThrowException() {
@Test
@Order(15)
public void testEditFixedPriceOnBsqOffer() {
createBsqPaymentAccounts();
createLegacyBsqPaymentAccounts();
String fixedPriceAsString = "0.00005"; // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
final OfferInfo originalOffer = aliceClient.createFixedPricedOffer(BUY.name(),
BSQ,
100_000_000L,
100_000_000L,
fixedPriceAsString,
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
BSQ);
log.info("ORIGINAL BSQ OFFER:\n{}", formatOfferTable(singletonList(originalOffer), "BSQ"));
genBtcBlocksThenWait(1, 2500); // Wait for offer book entry.
Expand All @@ -518,15 +518,15 @@ public void testEditFixedPriceOnBsqOffer() {
@Test
@Order(16)
public void testDisableBsqOffer() {
createBsqPaymentAccounts();
createLegacyBsqPaymentAccounts();
String fixedPriceAsString = "0.00005"; // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
final OfferInfo originalOffer = aliceClient.createFixedPricedOffer(BUY.name(),
BSQ,
100_000_000L,
100_000_000L,
fixedPriceAsString,
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
BSQ);
log.info("ORIGINAL BSQ OFFER:\n{}", formatOfferTable(singletonList(originalOffer), "BSQ"));
genBtcBlocksThenWait(1, 2500); // Wait for offer book entry.
Expand All @@ -551,15 +551,15 @@ public void testDisableBsqOffer() {
@Test
@Order(17)
public void testEditFixedPriceAndDisableBsqOffer() {
createBsqPaymentAccounts();
createLegacyBsqPaymentAccounts();
String fixedPriceAsString = "0.00005"; // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
final OfferInfo originalOffer = aliceClient.createFixedPricedOffer(BUY.name(),
BSQ,
100_000_000L,
100_000_000L,
fixedPriceAsString,
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
BSQ);
log.info("ORIGINAL BSQ OFFER:\n{}", formatOfferTable(singletonList(originalOffer), "BSQ"));
genBtcBlocksThenWait(1, 2500); // Wait for offer book entry.
Expand Down
14 changes: 7 additions & 7 deletions apitest/src/test/java/bisq/apitest/method/trade/BsqSwapTradeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import bisq.proto.grpc.BsqSwapOfferInfo;
import bisq.proto.grpc.BsqSwapTradeInfo;

import protobuf.BsqSwapTrade;

import java.util.ArrayList;
import java.util.List;

Expand All @@ -43,6 +41,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static protobuf.BsqSwapTrade.State.COMPLETED;
import static protobuf.BsqSwapTrade.State.PREPARATION;
import static protobuf.OfferDirection.BUY;


Expand All @@ -63,7 +63,6 @@ public class BsqSwapTradeTest extends AbstractOfferTest {
@BeforeAll
public static void setUp() {
AbstractOfferTest.setUp();
createBsqSwapBsqPaymentAccounts();
}

@BeforeEach
Expand All @@ -87,7 +86,7 @@ public void testAliceCreateBsqSwapBuyOffer() {
1_000_000L,
1_000_000L,
"0.00005",
alicesBsqAcct.getId());
alicesBsqSwapAcct.getId());
log.debug("BsqSwap Sell BSQ (Buy BTC) OFFER:\n{}", bsqSwapOffer);
var newOfferId = bsqSwapOffer.getId();
assertNotEquals("", newOfferId);
Expand All @@ -105,20 +104,21 @@ public void testAliceCreateBsqSwapBuyOffer() {
public void testBobTakesBsqSwapOffer() {
var bsqSwapOffer = getAvailableBsqSwapOffer();
var bsqSwapTradeInfo = bobClient.takeBsqSwapOffer(bsqSwapOffer.getId(),
bobsBsqAcct.getId(),
bobsBsqSwapAcct.getId(),
BISQ_FEE_CURRENCY_CODE);
log.debug("Trade at t1: {}", bsqSwapTradeInfo);
assertEquals(BsqSwapTrade.State.PREPARATION.name(), bsqSwapTradeInfo.getState());
assertEquals(PREPARATION.name(), bsqSwapTradeInfo.getState());
genBtcBlocksThenWait(1, 3_000);

bsqSwapTradeInfo = getBsqSwapTrade(bsqSwapTradeInfo.getTradeId());
log.debug("Trade at t2: {}", bsqSwapTradeInfo);
assertEquals(BsqSwapTrade.State.COMPLETED.name(), bsqSwapTradeInfo.getState());
assertEquals(COMPLETED.name(), bsqSwapTradeInfo.getState());
}

@Test
@Order(4)
public void testGetBalancesAfterTrade() {
sleep(2_500); // Give wallet time to finish processing TX.
var alicesBalances = aliceClient.getBalances();
log.info("Alice's After Trade Balance:\n{}", formatBalancesTbls(alicesBalances));
var bobsBalances = bobClient.getBalances();
Expand Down
6 changes: 3 additions & 3 deletions apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class TakeBuyBSQOfferTest extends AbstractTradeTest {
@BeforeAll
public static void setUp() {
AbstractOfferTest.setUp();
createBsqPaymentAccounts();
createLegacyBsqPaymentAccounts();
EXPECTED_PROTOCOL_STATUS.init();
}

Expand All @@ -90,7 +90,7 @@ public void testTakeAlicesSellBTCForBSQOffer(final TestInfo testInfo) {
7_500_000L,
"0.000035", // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
TRADE_FEE_CURRENCY_CODE);
log.info("ALICE'S BUY BSQ (SELL BTC) OFFER:\n{}", formatOfferTable(singletonList(alicesOffer), BSQ));
genBtcBlocksThenWait(1, 5000);
Expand All @@ -100,7 +100,7 @@ public void testTakeAlicesSellBTCForBSQOffer(final TestInfo testInfo) {
var alicesBsqOffers = aliceClient.getMyCryptoCurrencyOffers(btcTradeDirection, BSQ);
assertEquals(1, alicesBsqOffers.size());

var trade = takeAlicesOffer(offerId, bobsBsqAcct.getId(), TRADE_FEE_CURRENCY_CODE);
var trade = takeAlicesOffer(offerId, bobsLegacyBsqAcct.getId(), TRADE_FEE_CURRENCY_CODE);
assertNotNull(trade);
assertEquals(offerId, trade.getTradeId());
assertFalse(trade.getIsCurrencyForTakerFeeBtc());
Expand Down
6 changes: 3 additions & 3 deletions apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public class TakeSellBSQOfferTest extends AbstractTradeTest {
@BeforeAll
public static void setUp() {
AbstractOfferTest.setUp();
createBsqPaymentAccounts();
createLegacyBsqPaymentAccounts();
EXPECTED_PROTOCOL_STATUS.init();
}

Expand All @@ -91,7 +91,7 @@ public void testTakeAlicesBuyBTCForBSQOffer(final TestInfo testInfo) {
7_500_000L,
"0.000035", // FIXED PRICE IN BTC (satoshis) FOR 1 BSQ
getDefaultBuyerSecurityDepositAsPercent(),
alicesBsqAcct.getId(),
alicesLegacyBsqAcct.getId(),
TRADE_FEE_CURRENCY_CODE);
log.info("ALICE'S SELL BSQ (BUY BTC) OFFER:\n{}", formatOfferTable(singletonList(alicesOffer), BSQ));
genBtcBlocksThenWait(1, 4000);
Expand All @@ -101,7 +101,7 @@ public void testTakeAlicesBuyBTCForBSQOffer(final TestInfo testInfo) {
var alicesBsqOffers = aliceClient.getMyCryptoCurrencyOffers(btcTradeDirection, BSQ);
assertEquals(1, alicesBsqOffers.size());

var trade = takeAlicesOffer(offerId, bobsBsqAcct.getId(), TRADE_FEE_CURRENCY_CODE);
var trade = takeAlicesOffer(offerId, bobsLegacyBsqAcct.getId(), TRADE_FEE_CURRENCY_CODE);
assertNotNull(trade);
assertEquals(offerId, trade.getTradeId());
assertTrue(trade.getIsCurrencyForTakerFeeBtc());
Expand Down
Loading