fix imports for framing2 module

stratum-mining · Apr 13, 2024 · 9286b53 · 9286b53
1 parent 5e2ccd5
commit 9286b53
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/protocols/v2/codec-sv2/src/decoder.rs b/protocols/v2/codec-sv2/src/decoder.rs
@@ -8,11 +8,11 @@ pub use buffer_sv2::AeadBuffer;
 pub use const_sv2::{SV2_FRAME_CHUNK_SIZE, SV2_FRAME_HEADER_SIZE};
 use core::marker::PhantomData;
 #[cfg(feature = "noise_sv2")]
-use framing_sv2::framing2::HandShakeFrame;
+use framing_sv2::framing2::either_frame::HandShakeFrame;
 #[cfg(feature = "noise_sv2")]
 use framing_sv2::header::NoiseHeader;
 use framing_sv2::{
-    framing2::{EitherFrame, Frame as F_, Sv2Frame},
+    framing2::{either_frame::EitherFrame, frame::Frame as F_, sv2_frame::Sv2Frame},
     header::Header,
 };
 #[cfg(feature = "noise_sv2")]

diff --git a/protocols/v2/codec-sv2/src/encoder.rs b/protocols/v2/codec-sv2/src/encoder.rs
@@ -6,8 +6,8 @@ pub use const_sv2::{AEAD_MAC_LEN, SV2_FRAME_CHUNK_SIZE, SV2_FRAME_HEADER_SIZE};
 use core::convert::TryInto;
 use core::marker::PhantomData;
 #[cfg(feature = "noise_sv2")]
-use framing_sv2::framing2::{EitherFrame, HandShakeFrame};
-use framing_sv2::framing2::{Frame as F_, Sv2Frame};
+use framing_sv2::framing2::either_frame::{EitherFrame, HandShakeFrame};
+use framing_sv2::framing2::{frame::Frame as F_, sv2_frame::Sv2Frame};
 #[allow(unused_imports)]
 pub use framing_sv2::header::NoiseHeader;
 

diff --git a/protocols/v2/codec-sv2/src/lib.rs b/protocols/v2/codec-sv2/src/lib.rs
@@ -21,16 +21,16 @@ pub use encoder::Encoder;
 #[cfg(feature = "noise_sv2")]
 pub use encoder::NoiseEncoder;
 
-pub use framing_sv2::framing2::{Frame, Sv2Frame};
 #[cfg(feature = "noise_sv2")]
-pub use framing_sv2::framing2::{HandShakeFrame, NoiseFrame};
+pub use framing_sv2::framing2::{either_frame::HandShakeFrame, noise_frame::NoiseFrame};
+pub use framing_sv2::framing2::{frame::Frame, sv2_frame::Sv2Frame};
 
 #[cfg(feature = "noise_sv2")]
 pub use noise_sv2::{self, Initiator, NoiseCodec, Responder};
 
 pub use buffer_sv2;
 
-pub use framing_sv2::{self, framing2::handshake_message_to_frame as h2f};
+pub use framing_sv2::{self, framing2::noise_frame::handshake_message_to_frame as h2f};
 
 #[cfg(feature = "noise_sv2")]
 #[derive(Debug)]

diff --git a/protocols/v2/roles-logic-sv2/src/parsers.rs b/protocols/v2/roles-logic-sv2/src/parsers.rs
@@ -13,7 +13,7 @@ use binary_sv2::GetSize;
 
 use binary_sv2::{from_bytes, Deserialize};
 
-use framing_sv2::framing2::{Frame, Sv2Frame};
+use framing_sv2::framing2::{frame::Frame, sv2_frame::Sv2Frame};
 
 use const_sv2::{
     CHANNEL_BIT_ALLOCATE_MINING_JOB_TOKEN, CHANNEL_BIT_ALLOCATE_MINING_JOB_TOKEN_SUCCESS,