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.

Sign up for GitHub

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

fix(net): Allow custom noise configuration #46

Merged
merged 2 commits into from
Aug 27, 2024
Merged

fix(net): Allow custom noise configuration #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e42420d
fix(net): Allow custom noise configuration
refcell Aug 27, 2024
3d4cce6
fix(net): remove result
refcell Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions crates/net/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ pub struct NetworkDriverBuilder {
keypair: Option<Keypair>,
/// The [TcpConfig] for the swarm.
tcp_config: Option<TcpConfig>,
// /// The [NoiseConfig] for the swarm.
// noise_config: Option<NoiseConfig>,
/// The [NoiseConfig] for the swarm.
noise_config: Option<NoiseConfig>,
/// The [YamuxConfig] for the swarm.
yamux_config: Option<YamuxConfig>,
}
Expand Down Expand Up @@ -75,11 +75,11 @@ impl NetworkDriverBuilder {
self
}

// /// Specifies the [NoiseConfig] for the swarm.
// pub fn with_noise_config(&mut self, noise_config: NoiseConfig) -> &mut Self {
// self.noise_config = Some(noise_config);
// self
// }
/// Specifies the [NoiseConfig] for the swarm.
pub fn with_noise_config(&mut self, noise_config: NoiseConfig) -> &mut Self {
self.noise_config = Some(noise_config);
self
}

/// Specifies the [YamuxConfig] for the swarm.
pub fn with_yamux_config(&mut self, yamux_config: YamuxConfig) -> &mut Self {
Expand Down Expand Up @@ -111,12 +111,18 @@ impl NetworkDriverBuilder {
let behaviour = Behaviour::new(config, &[Box::new(handler.clone())])?;

// Build the swarm.
let noise_config = self.noise_config.take();
let keypair = self.keypair.take().unwrap_or(Keypair::generate_secp256k1());
let swarm = SwarmBuilder::with_existing_identity(keypair)
.with_tokio()
.with_tcp(self.tcp_config.take().unwrap_or_default(), NoiseConfig::new, || {
self.yamux_config.take().unwrap_or_default()
})?
.with_tcp(
self.tcp_config.take().unwrap_or_default(),
|i: &Keypair| match noise_config {
Some(cfg) => Ok(cfg),
None => NoiseConfig::new(i),
},
|| self.yamux_config.take().unwrap_or_default(),
)?
.with_behaviour(|_| behaviour)?
.build();
let addr = self.socket.take().ok_or_else(|| eyre::eyre!("socket address not set"))?;
Expand Down