follow libp2p pattern for proto files

sigp · Feb 12, 2025 · 6ed5a32 · 6ed5a32
1 parent 0c09ca4
commit 6ed5a32
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/anchor/network/src/handshake/envelope/codec.rs b/anchor/network/src/handshake/envelope/codec.rs
@@ -3,8 +3,7 @@ use crate::handshake::envelope::{parse_envelope, Envelope};
 use async_trait::async_trait;
 use futures::{AsyncReadExt, AsyncWriteExt};
 use libp2p::futures::{AsyncRead, AsyncWrite};
-use libp2p::request_response::Codec as RequestResponseCodec;
-use libp2p::StreamProtocol;
+use libp2p::{request_response, StreamProtocol};
 use std::io;
 use tracing::debug;
 
@@ -21,7 +20,7 @@ impl From<envelope::Error> for io::Error {
 pub struct Codec;
 
 #[async_trait]
-impl RequestResponseCodec for Codec {
+impl request_response::Codec for Codec {
     type Protocol = StreamProtocol;
     type Request = Envelope;
     type Response = Envelope;

diff --git a/...ork/src/handshake/envelope/envelope.proto → ...andshake/envelope/generated/message.proto b/...ork/src/handshake/envelope/envelope.proto → ...andshake/envelope/generated/message.proto
diff --git a/anchor/network/src/handshake/envelope/generated/message/mod.rs b/anchor/network/src/handshake/envelope/generated/message/mod.rs
@@ -0,0 +1 @@
+pub mod pb;
diff --git a/...etwork/src/handshake/envelope/envelope.rs → ...andshake/envelope/generated/message/pb.rs b/...etwork/src/handshake/envelope/envelope.rs → ...andshake/envelope/generated/message/pb.rs
diff --git a/anchor/network/src/handshake/envelope/generated/mod.rs b/anchor/network/src/handshake/envelope/generated/mod.rs
@@ -0,0 +1 @@
+pub mod message;
diff --git a/anchor/network/src/handshake/envelope/mod.rs b/anchor/network/src/handshake/envelope/mod.rs
@@ -1,5 +1,5 @@
 mod codec;
-mod envelope;
+mod generated;
 
 use crate::handshake::node_info::NodeInfo;
 use discv5::libp2p_identity::PublicKey;
@@ -73,4 +73,4 @@ pub fn make_unsigned(
 
 use crate::handshake::envelope::Error::SignatureVerification;
 pub use codec::Codec;
-pub use envelope::Envelope;
+pub use generated::message::pb::Envelope;