Skip to content

Commit 97f6e46

Browse files
thomaseizingerthomaseizinger
committed
Split behaviour into client and server
1 parent d85e38b commit 97f6e46

File tree

10 files changed

+536
-304
lines changed

10 files changed

+536
-304
lines changed

‎protocols/rendezvous/examples/discover.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ async fn main() {
4343
let mut swarm = Swarm::new(
4444
development_transport(identity.clone()).await.unwrap(),
4545
MyBehaviour {
46-
rendezvous: rendezvous::Behaviour::new(identity.clone(), rendezvous::Config::default()),
46+
rendezvous: rendezvous::client::Behaviour::new(identity.clone()),
4747
ping: Ping::new(PingConfig::new().with_interval(Duration::from_secs(1))),
4848
},
4949
PeerId::from(identity.public()),
@@ -79,7 +79,7 @@ async fn main() {
7979
);
8080
return;
8181
}
82-
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::Event::Discovered {
82+
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::client::Event::Discovered {
8383
registrations,
8484
..
8585
})) => {
@@ -115,12 +115,12 @@ async fn main() {
115115

116116
#[derive(Debug)]
117117
enum MyEvent {
118-
Rendezvous(rendezvous::Event),
118+
Rendezvous(rendezvous::client::Event),
119119
Ping(PingEvent),
120120
}
121121

122-
impl From<rendezvous::Event> for MyEvent {
123-
fn from(event: rendezvous::Event) -> Self {
122+
impl From<rendezvous::client::Event> for MyEvent {
123+
fn from(event: rendezvous::client::Event) -> Self {
124124
MyEvent::Rendezvous(event)
125125
}
126126
}
@@ -135,6 +135,6 @@ impl From<PingEvent> for MyEvent {
135135
#[behaviour(event_process = false)]
136136
#[behaviour(out_event = "MyEvent")]
137137
struct MyBehaviour {
138-
rendezvous: rendezvous::Behaviour,
138+
rendezvous: rendezvous::client::Behaviour,
139139
ping: Ping,
140140
}

‎protocols/rendezvous/examples/register.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ async fn main() {
4343
let mut swarm = Swarm::new(
4444
development_transport(identity.clone()).await.unwrap(),
4545
MyBehaviour {
46-
rendezvous: rendezvous::Behaviour::new(identity.clone(), rendezvous::Config::default()),
46+
rendezvous: rendezvous::client::Behaviour::new(identity.clone()),
4747
ping: Ping::new(PingConfig::new().with_interval(Duration::from_secs(1))),
4848
},
4949
PeerId::from(identity.public()),
@@ -81,7 +81,7 @@ async fn main() {
8181
log::info!("Connection established with rendezvous point {}", peer_id);
8282
}
8383
// once `/identify` did its job, we know our external address and can register
84-
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::Event::Registered {
84+
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::client::Event::Registered {
8585
namespace,
8686
ttl,
8787
rendezvous_node,
@@ -93,9 +93,9 @@ async fn main() {
9393
ttl
9494
);
9595
}
96-
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::Event::RegisterFailed(
97-
error,
98-
))) => {
96+
SwarmEvent::Behaviour(MyEvent::Rendezvous(
97+
rendezvous::client::Event::RegisterFailed(error),
98+
)) => {
9999
log::error!("Failed to register {}", error);
100100
return;
101101
}
@@ -114,12 +114,12 @@ async fn main() {
114114

115115
#[derive(Debug)]
116116
enum MyEvent {
117-
Rendezvous(rendezvous::Event),
117+
Rendezvous(rendezvous::client::Event),
118118
Ping(PingEvent),
119119
}
120120

121-
impl From<rendezvous::Event> for MyEvent {
122-
fn from(event: rendezvous::Event) -> Self {
121+
impl From<rendezvous::client::Event> for MyEvent {
122+
fn from(event: rendezvous::client::Event) -> Self {
123123
MyEvent::Rendezvous(event)
124124
}
125125
}
@@ -134,6 +134,6 @@ impl From<PingEvent> for MyEvent {
134134
#[behaviour(event_process = false)]
135135
#[behaviour(out_event = "MyEvent")]
136136
struct MyBehaviour {
137-
rendezvous: rendezvous::Behaviour,
137+
rendezvous: rendezvous::client::Behaviour,
138138
ping: Ping,
139139
}

‎protocols/rendezvous/examples/register_with_identify.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async fn main() {
4747
"rendezvous-example/1.0.0".to_string(),
4848
identity.public(),
4949
)),
50-
rendezvous: rendezvous::Behaviour::new(identity.clone(), rendezvous::Config::default()),
50+
rendezvous: rendezvous::client::Behaviour::new(identity.clone()),
5151
ping: Ping::new(PingConfig::new().with_interval(Duration::from_secs(1))),
5252
},
5353
PeerId::from(identity.public()),
@@ -79,7 +79,7 @@ async fn main() {
7979
None,
8080
);
8181
}
82-
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::Event::Registered {
82+
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::client::Event::Registered {
8383
namespace,
8484
ttl,
8585
rendezvous_node,
@@ -91,9 +91,9 @@ async fn main() {
9191
ttl
9292
);
9393
}
94-
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::Event::RegisterFailed(
95-
error,
96-
))) => {
94+
SwarmEvent::Behaviour(MyEvent::Rendezvous(
95+
rendezvous::client::Event::RegisterFailed(error),
96+
)) => {
9797
log::error!("Failed to register {}", error);
9898
return;
9999
}
@@ -112,13 +112,13 @@ async fn main() {
112112

113113
#[derive(Debug)]
114114
enum MyEvent {
115-
Rendezvous(rendezvous::Event),
115+
Rendezvous(rendezvous::client::Event),
116116
Identify(IdentifyEvent),
117117
Ping(PingEvent),
118118
}
119119

120-
impl From<rendezvous::Event> for MyEvent {
121-
fn from(event: rendezvous::Event) -> Self {
120+
impl From<rendezvous::client::Event> for MyEvent {
121+
fn from(event: rendezvous::client::Event) -> Self {
122122
MyEvent::Rendezvous(event)
123123
}
124124
}
@@ -140,6 +140,6 @@ impl From<PingEvent> for MyEvent {
140140
#[behaviour(out_event = "MyEvent")]
141141
struct MyBehaviour {
142142
identify: Identify,
143-
rendezvous: rendezvous::Behaviour,
143+
rendezvous: rendezvous::client::Behaviour,
144144
ping: Ping,
145145
}

‎protocols/rendezvous/examples/rendezvous_point.rs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ async fn main() {
3737
let mut swarm = Swarm::new(
3838
development_transport(identity.clone()).await.unwrap(),
3939
MyBehaviour {
40-
rendezvous: rendezvous::Behaviour::new(identity.clone(), rendezvous::Config::default()),
40+
rendezvous: rendezvous::server::Behaviour::new(rendezvous::server::Config::default()),
4141
ping: Ping::default(),
4242
},
4343
PeerId::from(identity.public()),
@@ -57,20 +57,21 @@ async fn main() {
5757
SwarmEvent::ConnectionClosed { peer_id, .. } => {
5858
log::info!("Disconnected from {}", peer_id);
5959
}
60-
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::Event::PeerRegistered {
61-
peer,
62-
registration,
63-
})) => {
60+
SwarmEvent::Behaviour(MyEvent::Rendezvous(
61+
rendezvous::server::Event::PeerRegistered { peer, registration },
62+
)) => {
6463
log::info!(
6564
"Peer {} registered for namespace '{}'",
6665
peer,
6766
registration.namespace
6867
);
6968
}
70-
SwarmEvent::Behaviour(MyEvent::Rendezvous(rendezvous::Event::DiscoverServed {
71-
enquirer,
72-
registrations,
73-
})) => {
69+
SwarmEvent::Behaviour(MyEvent::Rendezvous(
70+
rendezvous::server::Event::DiscoverServed {
71+
enquirer,
72+
registrations,
73+
},
74+
)) => {
7475
log::info!(
7576
"Served peer {} with {} registrations",
7677
enquirer,
@@ -86,12 +87,12 @@ async fn main() {
8687

8788
#[derive(Debug)]
8889
enum MyEvent {
89-
Rendezvous(rendezvous::Event),
90+
Rendezvous(rendezvous::server::Event),
9091
Ping(PingEvent),
9192
}
9293

93-
impl From<rendezvous::Event> for MyEvent {
94-
fn from(event: rendezvous::Event) -> Self {
94+
impl From<rendezvous::server::Event> for MyEvent {
95+
fn from(event: rendezvous::server::Event) -> Self {
9596
MyEvent::Rendezvous(event)
9697
}
9798
}
@@ -106,6 +107,6 @@ impl From<PingEvent> for MyEvent {
106107
#[behaviour(event_process = false)]
107108
#[behaviour(out_event = "MyEvent")]
108109
struct MyBehaviour {
109-
rendezvous: rendezvous::Behaviour,
110+
rendezvous: rendezvous::server::Behaviour,
110111
ping: Ping,
111112
}

0 commit comments

Comments
 (0)