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

Remove Nullable annotations. arbitratorNodeAddress is not null and accountAgeWitnessSignatureOfOfferId

Browse source 
was added in v 0.6 so is with todays versions also not null
This commit is contained in:
chimp1984 2020-09-21 19:48:01 -05:00
parent 6a83534377
commit 87c2ddf200
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/src/main/java/bisq/core/trade/messages/InputsForDepositTxRequest.java
View file

@ -61,13 +61,10 @@ public final class InputsForDepositTxRequest extends TradeMessage implements Dir
private final List<NodeAddress> acceptedArbitratorNodeAddresses;
private final List<NodeAddress> acceptedMediatorNodeAddresses;
private final List<NodeAddress> acceptedRefundAgentNodeAddresses;
@Nullable
private final NodeAddress arbitratorNodeAddress;
private final NodeAddress mediatorNodeAddress;
private final NodeAddress refundAgentNodeAddress;
// added in v 0.6. can be null if we trade with an older peer
@Nullable
private final byte[] accountAgeWitnessSignatureOfOfferId;
private final long currentDate;
@ -95,7 +92,7 @@ public final class InputsForDepositTxRequest extends TradeMessage implements Dir
NodeAddress refundAgentNodeAddress,
String uid,
int messageVersion,
@Nullable byte[] accountAgeWitnessSignatureOfOfferId,
byte[] accountAgeWitnessSignatureOfOfferId,
long currentDate) {
super(messageVersion, tradeId, uid);
this.senderNodeAddress = senderNodeAddress;
@ -155,12 +152,12 @@ public final class InputsForDepositTxRequest extends TradeMessage implements Dir
.map(NodeAddress::toProtoMessage).collect(Collectors.toList()))
.setMediatorNodeAddress(mediatorNodeAddress.toProtoMessage())
.setRefundAgentNodeAddress(refundAgentNodeAddress.toProtoMessage())
.setUid(uid);
.setUid(uid)
.setAccountAgeWitnessSignatureOfOfferId(ByteString.copyFrom(accountAgeWitnessSignatureOfOfferId))
.setArbitratorNodeAddress(arbitratorNodeAddress.toProtoMessage())
.setCurrentDate(currentDate);
Optional.ofNullable(changeOutputAddress).ifPresent(builder::setChangeOutputAddress);
Optional.ofNullable(accountAgeWitnessSignatureOfOfferId).ifPresent(e -> builder.setAccountAgeWitnessSignatureOfOfferId(ByteString.copyFrom(e)));
Optional.ofNullable(arbitratorNodeAddress).ifPresent(e -> builder.setArbitratorNodeAddress(arbitratorNodeAddress.toProtoMessage()));
builder.setCurrentDate(currentDate);
return getNetworkEnvelopeBuilder().setInputsForDepositTxRequest(builder).build();
}
@ -203,7 +200,7 @@ public final class InputsForDepositTxRequest extends TradeMessage implements Dir
NodeAddress.fromProto(proto.getRefundAgentNodeAddress()),
proto.getUid(),
messageVersion,
ProtoUtil.byteArrayOrNullFromProto(proto.getAccountAgeWitnessSignatureOfOfferId()),
proto.getAccountAgeWitnessSignatureOfOfferId().toByteArray(),
proto.getCurrentDate());
}