Skip to content

Commit 4701d37

Browse files
committed
remove rebase fuckup
1 parent 5c30945 commit 4701d37

File tree

1 file changed

+3
-16
lines changed
  • roles/roles-utils/network-helpers/src

1 file changed

+3
-16
lines changed

roles/roles-utils/network-helpers/src/lib.rs

+3-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
#![allow(dead_code)]
2-
#[cfg(feature = "async_std")]
3-
mod noise_connection_async_std;
4-
#[cfg(feature = "async_std")]
5-
mod plain_connection_async_std;
62
use binary_sv2::{Deserialize, GetSize, Serialize};
7-
#[cfg(feature = "async_std")]
8-
pub use noise_connection_async_std::{connect, listen, Connection};
9-
#[cfg(feature = "async_std")]
10-
pub use plain_connection_async_std::{plain_connect, plain_listen, PlainConnection};
11-
12-
#[cfg(feature = "tokio")]
13-
pub mod noise_connection_tokio;
14-
#[cfg(feature = "tokio")]
3+
4+
pub mod noise_connection;
155
pub mod noise_connection_tokio_with_tokio_channels;
16-
#[cfg(feature = "tokio")]
17-
pub mod plain_connection_tokio;
6+
pub mod plain_connection;
187

198
use async_channel::{Receiver, RecvError, SendError, Sender};
209
use codec_sv2::{Error as CodecError, HandShakeFrame, HandshakeRole, StandardEitherFrame};
@@ -56,14 +45,12 @@ impl<T> From<SendError<T>> for Error {
5645
}
5746
}
5847

59-
#[cfg(feature = "tokio")]
6048
impl<T> From<tokio::sync::broadcast::error::SendError<T>> for Error {
6149
fn from(_: tokio::sync::broadcast::error::SendError<T>) -> Self {
6250
Error::SendErrorTokio
6351
}
6452
}
6553

66-
#[cfg(feature = "tokio")]
6754
impl From<tokio::sync::broadcast::error::RecvError> for Error {
6855
fn from(_: tokio::sync::broadcast::error::RecvError) -> Self {
6956
Error::RecvErrorTokio

0 commit comments

Comments
 (0)