From 0aeaa5386cef30ce20a0fdb0755fe3b798df72e8 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Fri, 1 Jan 2021 14:06:16 -0500 Subject: [PATCH] Improve logs, optimize stream --- .../getdata/messages/GetDataResponse.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java b/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java index a86d6f2783..255c8c1347 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java +++ b/p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java @@ -27,8 +27,8 @@ import bisq.common.app.Capabilities; import bisq.common.app.Version; import bisq.common.proto.network.NetworkEnvelope; import bisq.common.proto.network.NetworkProtoResolver; +import bisq.common.util.Utilities; -import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; @@ -107,24 +107,18 @@ public final class GetDataResponse extends NetworkEnvelope implements SupportedC protobuf.NetworkEnvelope proto = getNetworkEnvelopeBuilder() .setGetDataResponse(builder) .build(); - log.info("Sending a GetDataResponse with {} kB", proto.getSerializedSize() / 1000d); + log.info("Sending a GetDataResponse with {}", Utilities.readableFileSize(proto.getSerializedSize())); return proto; } public static GetDataResponse fromProto(protobuf.GetDataResponse proto, NetworkProtoResolver resolver, int messageVersion) { - log.info("Received a GetDataResponse with {} kB", proto.getSerializedSize() / 1000d); - Set dataSet = new HashSet<>( - proto.getDataSetList().stream() - .map(entry -> (ProtectedStorageEntry) resolver.fromProto(entry)) - .collect(Collectors.toSet())); - - Set persistableNetworkPayloadSet = new HashSet<>( - proto.getPersistableNetworkPayloadItemsList().stream() - .map(e -> (PersistableNetworkPayload) resolver.fromProto(e)) - .collect(Collectors.toSet())); - + log.info("Received a GetDataResponse with {}", Utilities.readableFileSize(proto.getSerializedSize())); + Set dataSet = proto.getDataSetList().stream() + .map(entry -> (ProtectedStorageEntry) resolver.fromProto(entry)).collect(Collectors.toSet()); + Set persistableNetworkPayloadSet = proto.getPersistableNetworkPayloadItemsList().stream() + .map(e -> (PersistableNetworkPayload) resolver.fromProto(e)).collect(Collectors.toSet()); return new GetDataResponse(dataSet, persistableNetworkPayloadSet, proto.getRequestNonce(),