diff --git a/example/examples/echo-dialer.rs b/example/examples/echo-dialer.rs index 85d5a7ee..6964c257 100644 --- a/example/examples/echo-dialer.rs +++ b/example/examples/echo-dialer.rs @@ -47,7 +47,7 @@ fn main() { let tcp = TcpConfig::new(core.handle()); let with_secio = tcp - .with_upgrade(swarm::PlainText) + .with_upgrade(swarm::PlainTextConfig) .or_upgrade({ let private_key = { let pkcs8 = include_bytes!("test-private-key.pk8"); diff --git a/example/examples/echo-server.rs b/example/examples/echo-server.rs index 8f30bab9..d4f53e32 100644 --- a/example/examples/echo-server.rs +++ b/example/examples/echo-server.rs @@ -47,7 +47,7 @@ fn main() { let tcp = TcpConfig::new(core.handle()); let with_secio = tcp - .with_upgrade(swarm::PlainText) + .with_upgrade(swarm::PlainTextConfig) .or_upgrade({ let private_key = { let pkcs8 = include_bytes!("test-private-key.pk8"); diff --git a/libp2p-swarm/src/lib.rs b/libp2p-swarm/src/lib.rs index cc50d37f..b64ab574 100644 --- a/libp2p-swarm/src/lib.rs +++ b/libp2p-swarm/src/lib.rs @@ -148,4 +148,4 @@ pub mod transport; pub use self::connection_reuse::ConnectionReuse; pub use self::multiaddr::Multiaddr; pub use self::muxing::StreamMuxer; -pub use self::transport::{ConnectionUpgrade, PlainText, Transport, UpgradedNode, OrUpgrade}; +pub use self::transport::{ConnectionUpgrade, PlainTextConfig, Transport, UpgradedNode, OrUpgrade}; diff --git a/libp2p-swarm/src/transport.rs b/libp2p-swarm/src/transport.rs index 6f0100a1..87c5ae0e 100644 --- a/libp2p-swarm/src/transport.rs +++ b/libp2p-swarm/src/transport.rs @@ -448,11 +448,11 @@ impl Iterator for NamesIterChain /// simply passes communications through without doing anything more. /// /// > **Note**: Generally used as an alternative to `secio` if a security layer is not desirable. -// TODO: move `PlainText` to a separate crate? +// TODO: move `PlainTextConfig` to a separate crate? #[derive(Debug, Copy, Clone)] -pub struct PlainText; +pub struct PlainTextConfig; -impl ConnectionUpgrade for PlainText +impl ConnectionUpgrade for PlainTextConfig where C: AsyncRead + AsyncWrite { type Output = C;