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

Make offererContractSignature nullable

Browse source
This commit is contained in:
Manfred Karrer 2017-03-10 19:43:06 -05:00
parent 835373878e
commit cfb079609d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
network/src/main/java/io/bitsquare/messages/arbitration/Dispute.java
View file

@ -69,6 +69,7 @@ public final class Dispute implements Payload {
@Nullable @Nullable
private final String payoutTxId; private final String payoutTxId;
private final String contractAsJson; private final String contractAsJson;
@Nullable // not always filled in
private final String offererContractSignature; private final String offererContractSignature;
@Nullable // not always filled in @Nullable // not always filled in
private final String takerContractSignature; private final String takerContractSignature;
@ -107,8 +108,8 @@ public final class Dispute implements Payload {
@Nullable String depositTxId, @Nullable String depositTxId,
@Nullable String payoutTxId, @Nullable String payoutTxId,
String contractAsJson, String contractAsJson,
String offererContractSignature, @Nullable String offererContractSignature,
String takerContractSignature, @Nullable String takerContractSignature,
PubKeyRing arbitratorPubKeyRing, PubKeyRing arbitratorPubKeyRing,
boolean isSupportTicket) { boolean isSupportTicket) {
this(tradeId, traderId, disputeOpenerIsBuyer, disputeOpenerIsOfferer, traderPubKeyRing, tradeDate, this(tradeId, traderId, disputeOpenerIsBuyer, disputeOpenerIsOfferer, traderPubKeyRing, tradeDate,
@ -131,7 +132,7 @@ public final class Dispute implements Payload {
@Nullable String depositTxId, @Nullable String depositTxId,
@Nullable String payoutTxId, @Nullable String payoutTxId,
String contractAsJson, String contractAsJson,
String offererContractSignature, @Nullable String offererContractSignature,
@Nullable String takerContractSignature, @Nullable String takerContractSignature,
PubKeyRing arbitratorPubKeyRing, PubKeyRing arbitratorPubKeyRing,
boolean isSupportTicket) { boolean isSupportTicket) {
@ -281,10 +282,12 @@ public final class Dispute implements Payload {
return contractAsJson; return contractAsJson;
} }
@Nullable
public String getOffererContractSignature() { public String getOffererContractSignature() {
return offererContractSignature; return offererContractSignature;
} }
@Nullable
public String getTakerContractSignature() { public String getTakerContractSignature() {
return takerContractSignature; return takerContractSignature;
} }
@ -372,7 +375,6 @@ public final class Dispute implements Payload {
.setContract(contract.toProtoBuf()) .setContract(contract.toProtoBuf())
.setContractHash(ByteString.copyFrom(contractHash)) .setContractHash(ByteString.copyFrom(contractHash))
.setContractAsJson(contractAsJson) .setContractAsJson(contractAsJson)
.setOffererContractSignature(offererContractSignature)
.setArbitratorPubKeyRing(arbitratorPubKeyRing.toProtoBuf()) .setArbitratorPubKeyRing(arbitratorPubKeyRing.toProtoBuf())
.setIsSupportTicket(isSupportTicket) .setIsSupportTicket(isSupportTicket)
.addAllDisputeCommunicationMessages(disputeCommunicationMessages.stream().map( .addAllDisputeCommunicationMessages(disputeCommunicationMessages.stream().map(
@ -385,6 +387,7 @@ public final class Dispute implements Payload {
Optional.ofNullable(payoutTxId).ifPresent(builder::setPayoutTxId); Optional.ofNullable(payoutTxId).ifPresent(builder::setPayoutTxId);
Optional.ofNullable(disputePayoutTxId).ifPresent(builder::setDisputePayoutTxId); Optional.ofNullable(disputePayoutTxId).ifPresent(builder::setDisputePayoutTxId);
Optional.ofNullable(takerContractSignature).ifPresent(builder::setTakerContractSignature); Optional.ofNullable(takerContractSignature).ifPresent(builder::setTakerContractSignature);
Optional.ofNullable(offererContractSignature).ifPresent(builder::setOffererContractSignature);
Optional.ofNullable(disputeResult).ifPresent(result -> builder.setDisputeResult(disputeResult.toProtoBuf())); Optional.ofNullable(disputeResult).ifPresent(result -> builder.setDisputeResult(disputeResult.toProtoBuf()));
return builder.build(); return builder.build();
} }