From df08779b0b6f43d2f084d13a69813a7e266c0212 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 12 Jul 2023 10:36:10 +0100 Subject: [PATCH] Rename auth parameter in Want to authHex --- src/main/java/org/peergos/Want.java | 10 +++++----- .../java/org/peergos/protocol/bitswap/Bitswap.java | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/peergos/Want.java b/src/main/java/org/peergos/Want.java index bf2295cf..db0ca64b 100644 --- a/src/main/java/org/peergos/Want.java +++ b/src/main/java/org/peergos/Want.java @@ -6,10 +6,10 @@ public class Want { public final Cid cid; - public final Optional auth; - public Want(Cid cid, Optional auth) { + public final Optional authHex; + public Want(Cid cid, Optional authHex) { this.cid = cid; - this.auth = auth.flatMap(a -> a.isEmpty() ? Optional.empty() : Optional.of(a)); + this.authHex = authHex.flatMap(a -> a.isEmpty() ? Optional.empty() : Optional.of(a)); } public Want(Cid h) { @@ -21,11 +21,11 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Want want = (Want) o; - return cid.equals(want.cid) && auth.equals(want.auth); + return cid.equals(want.cid) && authHex.equals(want.authHex); } @Override public int hashCode() { - return Objects.hash(cid, auth); + return Objects.hash(cid, authHex); } } diff --git a/src/main/java/org/peergos/protocol/bitswap/Bitswap.java b/src/main/java/org/peergos/protocol/bitswap/Bitswap.java index 008eeb64..90ad9b46 100644 --- a/src/main/java/org/peergos/protocol/bitswap/Bitswap.java +++ b/src/main/java/org/peergos/protocol/bitswap/Bitswap.java @@ -1,7 +1,6 @@ package org.peergos.protocol.bitswap; import com.google.protobuf.*; -import io.ipfs.cid.*; import io.ipfs.multihash.Multihash; import io.libp2p.core.*; import io.libp2p.core.multiformats.*; @@ -75,7 +74,7 @@ public void sendWants(Host us, Set peers) { MessageOuterClass.Message.Wantlist.WantType.Block : MessageOuterClass.Message.Wantlist.WantType.Have) .setBlock(ByteString.copyFrom(want.cid.toBytes())) - .setAuth(ByteString.copyFrom(ArrayOps.hexToBytes(want.auth.orElse("")))) + .setAuth(ByteString.copyFrom(ArrayOps.hexToBytes(want.authHex.orElse("")))) .build()) .collect(Collectors.toList()); engine.buildAndSendMessages(wantsProto, Collections.emptyList(), Collections.emptyList(),