From b1e1b279bc815de0dfe101c5112847d80e77220f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?rich=CE=9Brd?= Date: Tue, 14 Jan 2025 14:32:38 -0400 Subject: [PATCH] fix(multiaddress): don't re-export `minprotobuf` --- libp2p/multiaddress.nim | 2 +- libp2p/protocols/connectivity/autonat/core.nim | 1 + libp2p/protocols/connectivity/dcutr/core.nim | 1 + libp2p/protocols/connectivity/relay/messages.nim | 1 + libp2p/protocols/rendezvous.nim | 1 + tests/testmultiaddress.nim | 2 +- tests/testrelayv1.nim | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libp2p/multiaddress.nim b/libp2p/multiaddress.nim index 1e76d59d29..410c36dde7 100644 --- a/libp2p/multiaddress.nim +++ b/libp2p/multiaddress.nim @@ -26,7 +26,7 @@ import errors, utility import stew/[base58, base32, endians2] -export results, minprotobuf, vbuffer, errors, utility +export results, vbuffer, errors, utility logScope: topics = "libp2p multiaddress" diff --git a/libp2p/protocols/connectivity/autonat/core.nim b/libp2p/protocols/connectivity/autonat/core.nim index ab108267c4..65e2973a7f 100644 --- a/libp2p/protocols/connectivity/autonat/core.nim +++ b/libp2p/protocols/connectivity/autonat/core.nim @@ -12,6 +12,7 @@ import stew/[results, objects] import chronos, chronicles import ../../../multiaddress, ../../../peerid, ../../../errors +import ../../../protobuf/minprotobuf logScope: topics = "libp2p autonat" diff --git a/libp2p/protocols/connectivity/dcutr/core.nim b/libp2p/protocols/connectivity/dcutr/core.nim index 93563aafaf..43c3b4dfc2 100644 --- a/libp2p/protocols/connectivity/dcutr/core.nim +++ b/libp2p/protocols/connectivity/dcutr/core.nim @@ -15,6 +15,7 @@ import chronos import stew/objects import ../../../multiaddress, ../../../errors, ../../../stream/connection +import ../../../protobuf/minprotobuf export multiaddress diff --git a/libp2p/protocols/connectivity/relay/messages.nim b/libp2p/protocols/connectivity/relay/messages.nim index f3d92f4611..93f702b721 100644 --- a/libp2p/protocols/connectivity/relay/messages.nim +++ b/libp2p/protocols/connectivity/relay/messages.nim @@ -12,6 +12,7 @@ import macros import stew/[objects, results] import ../../../peerinfo, ../../../signed_envelope +import ../../../protobuf/minprotobuf # Circuit Relay V1 Message diff --git a/libp2p/protocols/rendezvous.nim b/libp2p/protocols/rendezvous.nim index 26f54c3a22..6a988e4f04 100644 --- a/libp2p/protocols/rendezvous.nim +++ b/libp2p/protocols/rendezvous.nim @@ -14,6 +14,7 @@ import metrics except collect import chronos, chronicles, bearssl/rand, stew/[byteutils, objects, results] import ./protocol, + ../protobuf/minprotobuf, ../switch, ../routing_record, ../utils/heartbeat, diff --git a/tests/testmultiaddress.nim b/tests/testmultiaddress.nim index acdcf0544d..733073b5fd 100644 --- a/tests/testmultiaddress.nim +++ b/tests/testmultiaddress.nim @@ -15,7 +15,7 @@ import std/sequtils import unittest2 import stew/byteutils -import ../libp2p/[multicodec, multiaddress] +import ../libp2p/[multicodec, multiaddress, protobuf/minprotobuf] type PatternVector = object pattern: MaPattern diff --git a/tests/testrelayv1.nim b/tests/testrelayv1.nim index 951a1b65dd..1324933950 100644 --- a/tests/testrelayv1.nim +++ b/tests/testrelayv1.nim @@ -19,6 +19,7 @@ import protocols/connectivity/relay/utils, protocols/connectivity/relay/rtransport, multiaddress, + protobuf/minprotobuf, peerinfo, peerid, stream/connection,