used eyre:Result instead of expect

Author: cceliks

p2p/src/behaviour.rs

@@ -6,6 +6,7 @@ use libp2p::identity::{Keypair, PeerId, PublicKey};
 use libp2p::kad::store::MemoryStore;
 use libp2p::StreamProtocol;
 use libp2p::{autonat, dcutr, gossipsub, identify, kad, relay};
+use eyre::{eyre, Result};
 
 #[derive(libp2p::swarm::NetworkBehaviour)]
 pub struct DriaBehaviour {
@@ -23,17 +24,17 @@ impl DriaBehaviour {
         relay_behavior: relay::client::Behaviour,
         identity_protocol: String,
         kademlia_protocol: StreamProtocol,
-    ) -> Self {
+    ) -> Result<Self> {
         let public_key = key.public();
         let peer_id = public_key.to_peer_id();
-        Self {
+        Ok(Self {
             relay: relay_behavior,
-            gossipsub: create_gossipsub_behavior(peer_id),
+            gossipsub: create_gossipsub_behavior(peer_id)?,
             kademlia: create_kademlia_behavior(peer_id, kademlia_protocol),
             autonat: create_autonat_behavior(peer_id),
             dcutr: create_dcutr_behavior(peer_id),
             identify: create_identify_behavior(public_key, identity_protocol),
-        }
+        })
     }
 }
 
@@ -42,7 +43,7 @@ impl DriaBehaviour {
 fn create_kademlia_behavior(
     local_peer_id: PeerId,
     protocol_name: StreamProtocol,
-) -> kad::Behaviour<MemoryStore> {
+) -> kad::Behaviour<MemoryStore>{
     use kad::{Behaviour, Config};
 
     const QUERY_TIMEOUT_SECS: u64 = 5 * 60;
@@ -94,7 +95,7 @@ fn create_autonat_behavior(local_peer_id: PeerId) -> autonat::Behaviour {
 
 /// Configures the Gossipsub behavior for pub/sub messaging across peers.
 #[inline]
-fn create_gossipsub_behavior(author: PeerId) -> gossipsub::Behaviour {
+fn create_gossipsub_behavior(author: PeerId) -> Result<gossipsub::Behaviour> {
     use gossipsub::{
         Behaviour, ConfigBuilder, Message, MessageAuthenticity, MessageId, ValidationMode,
     };
@@ -138,23 +139,30 @@ fn create_gossipsub_behavior(author: PeerId) -> gossipsub::Behaviour {
     };
 
     // TODO: add data transform here later
+    let config = match ConfigBuilder::default()
+    .heartbeat_interval(Duration::from_secs(HEARTBEAT_INTERVAL_SECS))
+    .max_transmit_size(MAX_TRANSMIT_SIZE)
+    .message_id_fn(message_id_fn)
+    .message_capacity(MESSAGE_CAPACITY)
+    .message_ttl(Duration::from_secs(MESSAGE_TTL_SECS))
+    .gossip_ttl(Duration::from_secs(GOSSIP_TTL_SECS))
+    .duplicate_cache_time(Duration::from_secs(DUPLICATE_CACHE_TIME_SECS))
+    .max_ihave_length(MAX_IHAVE_LENGTH)
+    .send_queue_size(MAX_SEND_QUEUE_SIZE)
+    .validation_mode(VALIDATION_MODE)
+    .validate_messages()
+    .build() {
+        Ok(config) => config,
+        Err(e) => {
+            return Err(eyre!("Failed to create gossipsub config: {}", e));
+        }
+    };
 
-    Behaviour::new(
+    match Behaviour::new(
         MessageAuthenticity::Author(author),
-        ConfigBuilder::default()
-            .heartbeat_interval(Duration::from_secs(HEARTBEAT_INTERVAL_SECS))
-            .max_transmit_size(MAX_TRANSMIT_SIZE)
-            .message_id_fn(message_id_fn)
-            .message_capacity(MESSAGE_CAPACITY)
-            .message_ttl(Duration::from_secs(MESSAGE_TTL_SECS))
-            .gossip_ttl(Duration::from_secs(GOSSIP_TTL_SECS))
-            .duplicate_cache_time(Duration::from_secs(DUPLICATE_CACHE_TIME_SECS))
-            .max_ihave_length(MAX_IHAVE_LENGTH)
-            .send_queue_size(MAX_SEND_QUEUE_SIZE)
-            .validation_mode(VALIDATION_MODE)
-            .validate_messages()
-            .build()
-            .expect("Valid config"), // TODO: better error handling
-    )
-    .expect("Valid behaviour") // TODO: better error handling
+        config
+        ) {
+            Ok(behaviour) => Ok(behaviour),
+            Err(e) => Err(eyre!("Failed to create gossipsub behaviour: {}", e)),
+        }
 }

p2p/src/client.rs

@@ -1,5 +1,5 @@
 use super::*;
-use eyre::Result;
+use eyre::{eyre, Result};
 use libp2p::futures::StreamExt;
 use libp2p::gossipsub::{
     Message, MessageAcceptance, MessageId, PublishError, SubscriptionError, TopicHash,
@@ -72,13 +72,13 @@ impl DriaP2PClient {
             )?
             .with_quic()
             .with_relay_client(noise::Config::new, yamux::Config::default)?
-            .with_behaviour(|key, relay_behavior| {
-                Ok(DriaBehaviour::new(
+            .with_behaviour(|key, relay_behavior: libp2p::relay::client::Behaviour| {
+                DriaBehaviour::new(
                     key,
                     relay_behavior,
                     identity_protocol.clone(),
                     kademlia_protocol.clone(),
-                ))
+                ).unwrap()
             })?
             .with_swarm_config(|c| {
                 c.with_idle_connection_timeout(Duration::from_secs(IDLE_CONNECTION_TIMEOUT_SECS))
@@ -135,9 +135,7 @@ impl DriaP2PClient {
             identity_protocol,
             kademlia_protocol,
         })
-    }
-
-    /// Subscribe to a topic.
+    }    /// Subscribe to a topic.        
     pub fn subscribe(&mut self, topic_name: &str) -> Result<bool, SubscriptionError> {
         log::debug!("Subscribing to {}", topic_name);