mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-01-19 05:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove API createoffer's paymentAcctId request param (BSQ swap)

Browse Source
This commit is contained in:
ghubstan 2021-11-25 16:12:05 -03:00
parent 00a5e2b650
commit 3077be54f0
No known key found for this signature in database
GPG Key ID: E35592D6800A861E
5 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apitest/src/test/java/bisq/apitest/method/offer/BsqSwapOfferTest.java
View File

@ -23,7 +23,6 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@ -37,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static protobuf.OfferDirection.BUY;
@Disabled
// @Disabled
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class BsqSwapOfferTest extends AbstractOfferTest {
@ -112,8 +111,7 @@ public class BsqSwapOfferTest extends AbstractOfferTest {
var bsqSwapOffer = aliceClient.createBsqSwapOffer(BUY.name(),
1_000_000L,
1_000_000L,
"0.00005",
alicesBsqSwapAcct.getId());
"0.00005");
log.debug("BsqSwap Sell BSQ (Buy BTC) OFFER:\n{}", bsqSwapOffer);
var newOfferId = bsqSwapOffer.getId();
assertNotEquals("", newOfferId);

3
apitest/src/test/java/bisq/apitest/method/trade/BsqSwapTradeTest.java
View File

@ -84,8 +84,7 @@ public class BsqSwapTradeTest extends AbstractTradeTest {
var mySwapOffer = aliceClient.createBsqSwapOffer(BUY.name(),
1_000_000L, // 0.01 BTC
1_000_000L,
"0.00005",
alicesBsqSwapAcct.getId());
"0.00005");
log.debug("Pending BsqSwap Sell BSQ (Buy BTC) OFFER:\n{}", toOfferTable.apply(mySwapOffer));
var newOfferId = mySwapOffer.getId();
assertNotEquals("", newOfferId);

6
cli/src/main/java/bisq/cli/GrpcClient.java
View File

@ -145,13 +145,11 @@ public final class GrpcClient {
public OfferInfo createBsqSwapOffer(String direction,
long amount,
long minAmount,
String fixedPrice,
String paymentAcctId) {
String fixedPrice) {
return offersServiceRequest.createBsqSwapOffer(direction,
amount,
minAmount,
fixedPrice,
paymentAcctId);
fixedPrice);
}
public OfferInfo createFixedPricedOffer(String direction,

4
cli/src/main/java/bisq/cli/request/OffersServiceRequest.java
View File

@ -73,14 +73,12 @@ public class OffersServiceRequest {
public OfferInfo createBsqSwapOffer(String direction,
long amount,
long minAmount,
String fixedPrice,
String paymentAcctId) {
String fixedPrice) {
var request = CreateBsqSwapOfferRequest.newBuilder()
.setDirection(direction)
.setAmount(amount)
.setMinAmount(minAmount)
.setPrice(fixedPrice)
.setPaymentAccountId(paymentAcctId)
.build();
return grpcStubs.offersService.createBsqSwapOffer(request).getBsqSwapOffer();
}

1
proto/src/main/proto/grpc.proto
View File

@ -163,7 +163,6 @@ message CreateBsqSwapOfferRequest {
uint64 amount = 2;
uint64 minAmount = 3;
string price = 4;
string paymentAccountId = 5;
}
message CreateBsqSwapOfferReply {