Skip to content

Commit

Permalink
swarm/src/dial_opts: Implement From<Multiaddr> for DialOpts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mxinden
mxinden committed Nov 14, 2021
1 parent eab21a6 commit 5e3edb3
Show file tree
Hide file tree
Showing 21 changed files with 62 additions and 215 deletions.
2 changes: 1 addition & 1 deletion examples/chat-tokio.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
// Reach out to another node if specified
if let Some(to_dial) = std::env::args().nth(1) {
let addr: Multiaddr = to_dial.parse()?;
swarm.dial(DialOpts::unknown_peer_id().address(addr).build())?;
swarm.dial(addr)?;
println!("Dialed {:?}", to_dial)
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chat.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
// Reach out to another node if specified
if let Some(to_dial) = std::env::args().nth(1) {
let addr: Multiaddr = to_dial.parse()?;
swarm.dial(DialOpts::unknown_peer_id().address(addr).build())?;
swarm.dial(addr)?;
println!("Dialed {:?}", to_dial)
}

Expand Down
9 changes: 4 additions & 5 deletions examples/file-sharing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,11 +523,10 @@ mod network {
.behaviour_mut()
.kademlia
.add_address(&peer_id, peer_addr.clone());
match self.swarm.dial(
DialOpts::unknown_peer_id()
.address(peer_addr.with(Protocol::P2p(peer_id.into())))
.build(),
) {
match self
.swarm
.dial(peer_addr.with(Protocol::P2p(peer_id.into())))
{
Ok(()) => {
self.pending_dial.insert(peer_id, sender);
}
Expand Down
2 changes: 1 addition & 1 deletion examples/gossipsub-chat.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
if let Some(to_dial) = std::env::args().nth(1) {
let dialing = to_dial.clone();
match to_dial.parse() {
Ok(to_dial) => match swarm.dial(DialOpts::unknown_peer_id().address(to_dial).build()) {
Ok(to_dial) => match swarm.dial(to_dial) {
Ok(_) => println!("Dialed {:?}", dialing),
Err(e) => println!("Dial {:?} failed: {:?}", dialing, e),
},
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-private.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ fn main() -> Result<(), Box<dyn Error>> {
// Reach out to other nodes if specified
for to_dial in std::env::args().skip(1) {
let addr: Multiaddr = parse_legacy_multiaddr(&to_dial)?;
swarm.dial(DialOpts::unknown_peer_id().address(addr).build())?;
swarm.dial(addr)?;
println!("Dialed {:?}", to_dial)
}

Expand Down
2 changes: 1 addition & 1 deletion examples/ping.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ fn main() -> Result<(), Box<dyn Error>> {
// command-line argument, if any.
if let Some(addr) = std::env::args().nth(1) {
let remote = addr.parse()?;
swarm.dial(DialOpts::unknown_peer_id().address(remote).build())?;
swarm.dial(remote)?;
println!("Dialed {}", addr)
}

Expand Down
2 changes: 1 addition & 1 deletion misc/metrics/examples/metrics.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fn main() -> Result<(), Box<dyn Error>> {
swarm.listen_on("/ip4/0.0.0.0/tcp/0".parse()?)?;
if let Some(addr) = std::env::args().nth(1) {
let remote = addr.parse()?;
swarm.dial(DialOpts::unknown_peer_id().address(remote).build())?;
swarm.dial(remote)?;
tide::log::info!("Dialed {}", addr)
}

Expand Down
8 changes: 1 addition & 7 deletions protocols/gossipsub/tests/smoke.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,7 @@ impl Graph {
p2p_suffix_connected.unwrap()
);

next.1
.dial(
DialOpts::unknown_peer_id()
.address(connected_addr_no_p2p)
.build(),
)
.unwrap();
next.1.dial(connected_addr_no_p2p).unwrap();

connected_nodes.push(next);
}
Expand Down
12 changes: 3 additions & 9 deletions protocols/identify/src/identify.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,9 +563,7 @@ mod tests {
}
}
});
swarm2
.dial(DialOpts::unknown_peer_id().address(listen_addr).build())
.unwrap();
swarm2.dial(listen_addr).unwrap();

// nb. Either swarm may receive the `Identified` event first, upon which
// it will permit the connection to be closed, as defined by
Expand Down Expand Up @@ -645,9 +643,7 @@ mod tests {
}
});

swarm2
.dial(DialOpts::unknown_peer_id().address(listen_addr).build())
.unwrap();
swarm2.dial(listen_addr).unwrap();

async_std::task::block_on(async move {
loop {
Expand Down Expand Up @@ -734,9 +730,7 @@ mod tests {
}
});

swarm2
.dial(DialOpts::unknown_peer_id().address(listen_addr).build())
.unwrap();
swarm2.dial(listen_addr).unwrap();

// Wait until we identified.
async_std::task::block_on(async {
Expand Down
24 changes: 3 additions & 21 deletions protocols/ping/tests/ping.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,7 @@ fn ping_pong() {

let pid2 = peer2_id.clone();
let peer2 = async move {
swarm2
.dial(
DialOpts::unknown_peer_id()
.address(rx.next().await.unwrap())
.build(),
)
.unwrap();
swarm2.dial(rx.next().await.unwrap()).unwrap();

loop {
match swarm2.select_next_some().await {
Expand Down Expand Up @@ -162,13 +156,7 @@ fn max_failures() {
};

let peer2 = async move {
swarm2
.dial(
DialOpts::unknown_peer_id()
.address(rx.next().await.unwrap())
.build(),
)
.unwrap();
swarm2.dial(rx.next().await.unwrap()).unwrap();

let mut count2: u8 = 0;

Expand Down Expand Up @@ -228,13 +216,7 @@ fn unsupported_doesnt_fail() {
});

let result = async_std::task::block_on(async move {
swarm2
.dial(
DialOpts::unknown_peer_id()
.address(rx.next().await.unwrap())
.build(),
)
.unwrap();
swarm2.dial(rx.next().await.unwrap()).unwrap();

loop {
match swarm2.select_next_some().await {
Expand Down
6 changes: 1 addition & 5 deletions protocols/relay/examples/relay.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,7 @@ fn main() -> Result<(), Box<dyn Error>> {
}
Mode::ClientDial => {
let client_listen_address = get_client_listen_address(&opt);
swarm.dial(
DialOpts::unknown_peer_id()
.address(client_listen_address.parse()?)
.build(),
)?;
swarm.dial(client_listen_address.parse()?)?;
println!("starting as client dialer on {}", client_listen_address);
}
}
Expand Down
2 changes: 1 addition & 1 deletion protocols/relay/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
//! swarm.listen_on(relay_addr).unwrap();
//!
//! // Dial node (5678) via relay node (1234).
//! swarm.dial(DialOpts::unknown_peer_id().address(dst_addr).build()).unwrap();
//! swarm.dial(dst_addr).unwrap();
//! ```
//!
//! ## Terminology
Expand Down
112 changes: 15 additions & 97 deletions protocols/relay/tests/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,7 @@ fn src_connect_to_dst_listening_via_relay() {
}
};

src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay)
.build(),
)
.unwrap();
src_swarm.dial(dst_addr_via_relay).unwrap();
let src = async move {
// Source Node dialing Relay to connect to Destination Node.
match src_swarm.select_next_some().await {
Expand Down Expand Up @@ -227,13 +221,7 @@ fn src_connect_to_dst_not_listening_via_active_relay() {
dst_swarm.listen_on(Protocol::P2pCircuit.into()).unwrap();
spawn_swarm_on_pool(&pool, dst_swarm);

src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay)
.build(),
)
.unwrap();
src_swarm.dial(dst_addr_via_relay).unwrap();
pool.run_until(async move {
// Source Node dialing Relay to connect to Destination Node.
match src_swarm.select_next_some().await {
Expand Down Expand Up @@ -319,9 +307,7 @@ fn src_connect_to_dst_via_established_connection_to_relay() {
spawn_swarm_on_pool(&pool, dst_swarm);

pool.run_until(async move {
src_swarm
.dial(DialOpts::unknown_peer_id().address(relay_addr).build())
.unwrap();
src_swarm.dial(relay_addr).unwrap();

// Source Node establishing connection to Relay.
loop {
Expand All @@ -335,13 +321,7 @@ fn src_connect_to_dst_via_established_connection_to_relay() {
}
}

src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay)
.build(),
)
.unwrap();
src_swarm.dial(dst_addr_via_relay).unwrap();

// Source Node establishing connection to destination node via Relay.
loop {
Expand Down Expand Up @@ -395,13 +375,7 @@ fn src_try_connect_to_offline_dst() {
relay_swarm.listen_on(relay_addr.clone()).unwrap();
spawn_swarm_on_pool(&pool, relay_swarm);

src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay.clone())
.build(),
)
.unwrap();
src_swarm.dial(dst_addr_via_relay.clone()).unwrap();
pool.run_until(async move {
// Source Node dialing Relay to connect to Destination Node.
match src_swarm.select_next_some().await {
Expand Down Expand Up @@ -459,13 +433,7 @@ fn src_try_connect_to_unsupported_dst() {
dst_swarm.listen_on(dst_addr.clone()).unwrap();
spawn_swarm_on_pool(&pool, dst_swarm);

src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay.clone())
.build(),
)
.unwrap();
src_swarm.dial(dst_addr_via_relay.clone()).unwrap();
pool.run_until(async move {
// Source Node dialing Relay to connect to Destination Node.
match src_swarm.select_next_some().await {
Expand Down Expand Up @@ -516,13 +484,7 @@ fn src_try_connect_to_offline_dst_via_offline_relay() {
.with(dst_addr.into_iter().next().unwrap())
.with(Protocol::P2p(dst_peer_id.clone().into()));

src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay.clone())
.build(),
)
.unwrap();
src_swarm.dial(dst_addr_via_relay.clone()).unwrap();
pool.run_until(async move {
// Source Node dialing Relay to connect to Destination Node.
match src_swarm.select_next_some().await {
Expand Down Expand Up @@ -799,9 +761,7 @@ fn inactive_connection_timeout() {
spawn_swarm_on_pool(&pool, dst_swarm);

pool.run_until(async move {
src_swarm
.dial(DialOpts::unknown_peer_id().address(relay_addr).build())
.unwrap();
src_swarm.dial(relay_addr).unwrap();
// Source Node dialing Relay.
loop {
match src_swarm.select_next_some().await {
Expand All @@ -813,13 +773,7 @@ fn inactive_connection_timeout() {
}
}

src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay)
.build(),
)
.unwrap();
src_swarm.dial(dst_addr_via_relay).unwrap();

// Source Node establishing connection to destination node via Relay.
match src_swarm.select_next_some().await {
Expand Down Expand Up @@ -887,20 +841,8 @@ fn concurrent_connection_same_relay_same_dst() {
spawn_swarm_on_pool(&pool, dst_swarm);

pool.run_until(async move {
src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay.clone())
.build(),
)
.unwrap();
src_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay)
.build(),
)
.unwrap();
src_swarm.dial(dst_addr_via_relay.clone()).unwrap();
src_swarm.dial(dst_addr_via_relay).unwrap();

// Source Node establishing two connections to destination node via Relay.
let mut num_established = 0;
Expand Down Expand Up @@ -1045,20 +987,8 @@ fn yield_incoming_connection_through_correct_listener() {
}
});

src_1_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay_1.clone())
.build(),
)
.unwrap();
src_2_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay_2.clone())
.build(),
)
.unwrap();
src_1_swarm.dial(dst_addr_via_relay_1.clone()).unwrap();
src_2_swarm.dial(dst_addr_via_relay_2.clone()).unwrap();
spawn_swarm_on_pool(&pool, src_1_swarm);
spawn_swarm_on_pool(&pool, src_2_swarm);

Expand Down Expand Up @@ -1117,13 +1047,7 @@ fn yield_incoming_connection_through_correct_listener() {

// Expect destination node to reject incoming connection from unknown relay given that
// destination node is not listening for such connections.
src_3_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay_3.clone())
.build(),
)
.unwrap();
src_3_swarm.dial(dst_addr_via_relay_3.clone()).unwrap();
pool.run_until(async {
loop {
futures::select! {
Expand Down Expand Up @@ -1193,13 +1117,7 @@ fn yield_incoming_connection_through_correct_listener() {

// Expect destination node to accept incoming connection from "unknown" relay, i.e. the
// connection from source node 3 via relay 3.
src_3_swarm
.dial(
DialOpts::unknown_peer_id()
.address(dst_addr_via_relay_3.clone())
.build(),
)
.unwrap();
src_3_swarm.dial(dst_addr_via_relay_3.clone()).unwrap();
pool.run_until(async move {
loop {
match src_3_swarm.select_next_some().await {
Expand Down

0 comments on commit 5e3edb3

Please sign in to comment.