From 63efdc24408f4a0afeb64111014f7f7449a4b1c8 Mon Sep 17 00:00:00 2001 From: acul71 Date: Sun, 21 Sep 2025 21:01:42 -0400 Subject: [PATCH] Fix build system integration and type annotations for rendezvous module - Add rendezvous.proto to Makefile PB variable for protobuf generation - Fix type annotations in errors.py and messages.py for mypy compatibility - Changes ensure proper protobuf file generation and type checking --- Makefile | 3 ++- libp2p/discovery/rendezvous/errors.py | 4 ++-- libp2p/discovery/rendezvous/messages.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0d8ca81a2..32eee34fd 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,8 @@ PB = libp2p/crypto/pb/crypto.proto \ libp2p/host/autonat/pb/autonat.proto \ libp2p/relay/circuit_v2/pb/circuit.proto \ libp2p/relay/circuit_v2/pb/dcutr.proto \ - libp2p/kad_dht/pb/kademlia.proto + libp2p/kad_dht/pb/kademlia.proto \ + libp2p/discovery/rendezvous/pb/rendezvous.proto PY = $(PB:.proto=_pb2.py) PYI = $(PB:.proto=_pb2.pyi) diff --git a/libp2p/discovery/rendezvous/errors.py b/libp2p/discovery/rendezvous/errors.py index 2009a2f7e..b50eabe76 100644 --- a/libp2p/discovery/rendezvous/errors.py +++ b/libp2p/discovery/rendezvous/errors.py @@ -8,7 +8,7 @@ class RendezvousError(Exception): """Base exception for rendezvous protocol errors.""" - def __init__(self, status: Message.ResponseStatus, message: str = ""): + def __init__(self, status: Message.ResponseStatus.ValueType, message: str = ""): self.status = status self.message = message super().__init__(f"Rendezvous error {status}: {message}") @@ -64,7 +64,7 @@ def __init__(self, message: str = "Service unavailable"): def status_to_exception( - status: Message.ResponseStatus, message: str = "" + status: Message.ResponseStatus.ValueType, message: str = "" ) -> RendezvousError: """Convert a protobuf status to the appropriate exception.""" if status == Message.E_INVALID_NAMESPACE: diff --git a/libp2p/discovery/rendezvous/messages.py b/libp2p/discovery/rendezvous/messages.py index 2336e0f92..83ee4fb05 100644 --- a/libp2p/discovery/rendezvous/messages.py +++ b/libp2p/discovery/rendezvous/messages.py @@ -29,7 +29,7 @@ def create_register_message( def create_register_response_message( - status: Message.ResponseStatus, status_text: str = "", ttl: int = 0 + status: Message.ResponseStatus.ValueType, status_text: str = "", ttl: int = 0 ) -> Message: """Create a REGISTER_RESPONSE message.""" msg = Message() @@ -64,7 +64,7 @@ def create_discover_message( def create_discover_response_message( registrations: list[Message.Register], cookie: bytes = b"", - status: Message.ResponseStatus = Message.OK, + status: Message.ResponseStatus.ValueType = Message.OK, status_text: str = "", ) -> Message: """Create a DISCOVER_RESPONSE message."""