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

Remove duplicated buyer/seller proto fields (already exist no OfferInfo)

Browse source
This commit is contained in:
ghubstan 2022-01-20 16:50:08 -03:00
parent b10cb119f2
commit 69e6c9ce70
No known key found for this signature in database
GPG key ID: E35592D6800A861E
4 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/api/model/CanceledTradeInfo.java
View file

@ -37,8 +37,6 @@ public class CanceledTradeInfo {
.withTradeAmountAsLong(0) // Ignored .withTradeAmountAsLong(0) // Ignored
.withTradePrice(offer.getPrice().getValue()) .withTradePrice(offer.getPrice().getValue())
.withTradeVolume(0) // Ignored .withTradeVolume(0) // Ignored
.withBuyerDeposit(offer.getBuyerSecurityDeposit().value)
.withSellerDeposit(offer.getSellerSecurityDeposit().value)
.withTradingPeerNodeAddress("") // Ignored .withTradingPeerNodeAddress("") // Ignored
.withState("") // Ignored .withState("") // Ignored
.withPhase("") // Ignored .withPhase("") // Ignored

6
core/src/main/java/bisq/core/api/model/TradeInfo.java
View file

@ -57,8 +57,6 @@ public class TradeInfo implements Payload {
private final long tradeAmountAsLong; private final long tradeAmountAsLong;
private final long tradePrice; private final long tradePrice;
private final long tradeVolume; private final long tradeVolume;
private final long buyerDeposit;
private final long sellerDeposit;
private final String tradingPeerNodeAddress; private final String tradingPeerNodeAddress;
private final String state; private final String state;
private final String phase; private final String phase;
@ -90,8 +88,6 @@ public class TradeInfo implements Payload {
this.tradeAmountAsLong = builder.getTradeAmountAsLong(); this.tradeAmountAsLong = builder.getTradeAmountAsLong();
this.tradePrice = builder.getTradePrice(); this.tradePrice = builder.getTradePrice();
this.tradeVolume = builder.getTradeVolume(); this.tradeVolume = builder.getTradeVolume();
this.buyerDeposit = builder.getBuyerDeposit();
this.sellerDeposit = builder.getSellerDeposit();
this.tradingPeerNodeAddress = builder.getTradingPeerNodeAddress(); this.tradingPeerNodeAddress = builder.getTradingPeerNodeAddress();
this.state = builder.getState(); this.state = builder.getState();
this.phase = builder.getPhase(); this.phase = builder.getPhase();
@ -312,8 +308,6 @@ public class TradeInfo implements Payload {
", tradeAmountAsLong='" + tradeAmountAsLong + '\'' + "\n" + ", tradeAmountAsLong='" + tradeAmountAsLong + '\'' + "\n" +
", tradePrice='" + tradePrice + '\'' + "\n" + ", tradePrice='" + tradePrice + '\'' + "\n" +
", tradeVolume='" + tradeVolume + '\'' + "\n" + ", tradeVolume='" + tradeVolume + '\'' + "\n" +
", buyerDeposit='" + buyerDeposit + '\'' + "\n" +
", sellerDeposit='" + sellerDeposit + '\'' + "\n" +
", tradingPeerNodeAddress='" + tradingPeerNodeAddress + '\'' + "\n" + ", tradingPeerNodeAddress='" + tradingPeerNodeAddress + '\'' + "\n" +
", state='" + state + '\'' + "\n" + ", state='" + state + '\'' + "\n" +
", phase='" + phase + '\'' + "\n" + ", phase='" + phase + '\'' + "\n" +

12
core/src/main/java/bisq/core/api/model/builder/TradeInfoV1Builder.java
View file

@ -46,8 +46,6 @@ public final class TradeInfoV1Builder {
private long tradeAmountAsLong; private long tradeAmountAsLong;
private long tradePrice; private long tradePrice;
private long tradeVolume; private long tradeVolume;
private long buyerDeposit;
private long sellerDeposit;
private String tradingPeerNodeAddress; private String tradingPeerNodeAddress;
private String state; private String state;
private String phase; private String phase;
@ -132,16 +130,6 @@ public final class TradeInfoV1Builder {
return this; return this;
} }
public TradeInfoV1Builder withBuyerDeposit(long buyerDeposit) {
this.buyerDeposit = buyerDeposit;
return this;
}
public TradeInfoV1Builder withSellerDeposit(long sellerDeposit) {
this.sellerDeposit = sellerDeposit;
return this;
}
public TradeInfoV1Builder withTradePeriodState(String tradePeriodState) { public TradeInfoV1Builder withTradePeriodState(String tradePeriodState) {
this.tradePeriodState = tradePeriodState; this.tradePeriodState = tradePeriodState;
return this; return this;

4
proto/src/main/proto/grpc.proto
View file

@ -515,9 +515,7 @@ message TradeInfo {
BsqSwapTradeInfo bsqSwapTradeInfo = 28; BsqSwapTradeInfo bsqSwapTradeInfo = 28;
// Needed by open/closed/failed trade list items. // Needed by open/closed/failed trade list items.
uint64 buyerDeposit = 29; string closingStatus = 29;
uint64 sellerDeposit = 30;
string closingStatus = 31;
// TODO? Field for displaying correct precision per coin type, e.g., int32 coinPrecision = 32; // TODO? Field for displaying correct precision per coin type, e.g., int32 coinPrecision = 32;
} }