Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

transports/{tcp,dns,websocket}: Remove Clone implementation for *Config #2682

Merged
merged 4 commits into from May 31, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/lib.rs
Expand Up @@ -201,9 +201,10 @@ pub async fn development_transport(
keypair: identity::Keypair,
) -> std::io::Result<core::transport::Boxed<(PeerId, core::muxing::StreamMuxerBox)>> {
let transport = {
let tcp = tcp::TcpConfig::new().nodelay(true);
let dns_tcp = dns::DnsConfig::system(tcp).await?;
let ws_dns_tcp = websocket::WsConfig::new(dns_tcp.clone());
let dns_tcp = dns::DnsConfig::system(tcp::TcpConfig::new().nodelay(true)).await?;
let ws_dns_tcp = websocket::WsConfig::new(
dns::DnsConfig::system(tcp::TcpConfig::new().nodelay(true)).await?,
);
dns_tcp.or_transport(ws_dns_tcp)
};

Expand Down
2 changes: 2 additions & 0 deletions transports/dns/CHANGELOG.md
Expand Up @@ -2,6 +2,8 @@

- Update to `libp2p-core` `v0.33.0`.

- Remove implementation of `Clone` on `GenDnsConfig`.
mxinden marked this conversation as resolved.
Show resolved Hide resolved

# 0.32.1

- Update to `trust-dns` `v0.21`. See [PR 2543].
Expand Down
1 change: 0 additions & 1 deletion transports/dns/src/lib.rs
Expand Up @@ -107,7 +107,6 @@ pub type DnsConfig<T> = GenDnsConfig<T, AsyncStdConnection, AsyncStdConnectionPr
pub type TokioDnsConfig<T> = GenDnsConfig<T, TokioConnection, TokioConnectionProvider>;

/// A `Transport` wrapper for performing DNS lookups when dialing `Multiaddr`esses.
#[derive(Clone)]
pub struct GenDnsConfig<T, C, P>
where
C: DnsHandle<Error = ResolveError>,
Expand Down
2 changes: 2 additions & 0 deletions transports/tcp/CHANGELOG.md
Expand Up @@ -2,6 +2,8 @@

- Update to `libp2p-core` `v0.33.0`.

- Remove implementation of `Clone` on `GenTcpConfig`.
mxinden marked this conversation as resolved.
Show resolved Hide resolved

# 0.32.0 [2022-02-22]

- Update to `libp2p-core` `v0.32.0`.
Expand Down
6 changes: 3 additions & 3 deletions transports/tcp/src/lib.rs
Expand Up @@ -67,7 +67,7 @@ use std::{
use provider::{IfEvent, Provider};

/// The configuration for a TCP/IP transport capability for libp2p.
#[derive(Clone, Debug)]
#[derive(Debug)]
pub struct GenTcpConfig<T> {
/// The type of the I/O provider.
_impl: std::marker::PhantomData<T>,
Expand Down Expand Up @@ -258,7 +258,7 @@ where
/// let listen_addr2: Multiaddr = "/ip4/127.0.0.1/tcp/9002".parse().unwrap();
///
/// let mut tcp1 = TcpConfig::new().port_reuse(true);
/// let mut listener1 = tcp1.clone().listen_on(listen_addr1.clone()).expect("listener");
/// let mut listener1 = tcp1.listen_on(listen_addr1.clone()).expect("listener");
/// match listener1.next().await.expect("event")? {
/// ListenerEvent::NewAddress(listen_addr) => {
/// println!("Listening on {:?}", listen_addr);
Expand All @@ -269,7 +269,7 @@ where
/// }
///
/// let mut tcp2 = TcpConfig::new().port_reuse(true);
/// let mut listener2 = tcp2.clone().listen_on(listen_addr2).expect("listener");
/// let mut listener2 = tcp2.listen_on(listen_addr2).expect("listener");
/// match listener2.next().await.expect("event")? {
/// ListenerEvent::NewAddress(listen_addr) => {
/// println!("Listening on {:?}", listen_addr);
Expand Down
2 changes: 2 additions & 0 deletions transports/websocket/CHANGELOG.md
Expand Up @@ -2,6 +2,8 @@

- Update to `libp2p-core` `v0.33.0`.

- Remove implementation of `Clone` on `WsConfig`.
mxinden marked this conversation as resolved.
Show resolved Hide resolved

# 0.34.0 [2022-02-22]

- Update to `libp2p-core` `v0.32.0`.
Expand Down
2 changes: 1 addition & 1 deletion transports/websocket/src/lib.rs
Expand Up @@ -44,7 +44,7 @@ use std::{
};

/// A Websocket transport.
#[derive(Debug, Clone)]
#[derive(Debug)]
pub struct WsConfig<T: Transport>
where
T: Transport,
Expand Down