From 87c2ddf20015920780ab6850ffcaafe146bc83ac Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Mon, 21 Sep 2020 19:48:01 -0500
Subject: [PATCH] Remove Nullable annotations. arbitratorNodeAddress is not
 null and accountAgeWitnessSignatureOfOfferId was added in v 0.6 so is with
 todays versions also not null

---
 .../trade/messages/InputsForDepositTxRequest.java | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/bisq/core/trade/messages/InputsForDepositTxRequest.java b/core/src/main/java/bisq/core/trade/messages/InputsForDepositTxRequest.java
index 57df03a1b2..d0e8501a22 100644
--- a/core/src/main/java/bisq/core/trade/messages/InputsForDepositTxRequest.java
+++ b/core/src/main/java/bisq/core/trade/messages/InputsForDepositTxRequest.java
@@ -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());
     }