Rename DialerActor to Dialer

gnosisguild · Jan 6, 2025 · 05dee3b · 05dee3b
1 parent 4ceda49
commit 05dee3b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/packages/ciphernode/events/src/enclave_event/mod.rs b/packages/ciphernode/events/src/enclave_event/mod.rs
@@ -139,14 +139,18 @@ impl EnclaveEvent {
             _ => false,
         }
     }
+
+    pub fn event_type(&self) -> String {
+        let s = format!("{:?}", self);
+        extract_enclave_event_name(&s).to_string()
+    }
 }
 
 impl Event for EnclaveEvent {
     type Id = EventId;
 
     fn event_type(&self) -> String {
-        let s = format!("{:?}", self);
-        extract_enclave_event_name(&s).to_string()
+        self.event_type()
     }
 
     fn event_id(&self) -> Self::Id {

diff --git a/packages/ciphernode/net/src/bin/p2p_test.rs b/packages/ciphernode/net/src/bin/p2p_test.rs
@@ -4,7 +4,7 @@ use events::{EventBus, EventBusConfig, GetHistory};
 use libp2p::gossipsub;
 use net::correlation_id::CorrelationId;
 use net::events::{NetworkPeerCommand, NetworkPeerEvent};
-use net::DialerActor;
+use net::Dialer;
 use net::NetworkPeer;
 use std::time::Duration;
 use std::{collections::HashSet, env, process};
@@ -72,7 +72,7 @@ async fn main() -> Result<()> {
 
     // Set up dialer for peers
     for peer in peers {
-        DialerActor::dial_peer(peer, net_bus.clone(), tx.clone());
+        Dialer::dial_peer(peer, net_bus.clone(), tx.clone());
     }
 
     // Send our message first

diff --git a/packages/ciphernode/net/src/dialer.rs b/packages/ciphernode/net/src/dialer.rs
@@ -27,13 +27,13 @@ struct PendingConnection {
 }
 
 #[derive(Clone)]
-pub struct DialerActor {
+pub struct Dialer {
     net_bus: Addr<EventBus<NetworkPeerEvent>>,
     tx: mpsc::Sender<NetworkPeerCommand>,
     pending_connection: HashMap<ConnectionId, PendingConnection>,
 }
 
-impl DialerActor {
+impl Dialer {
     pub fn new(
         net_bus: Addr<EventBus<NetworkPeerEvent>>,
         tx: mpsc::Sender<NetworkPeerCommand>,
@@ -169,11 +169,11 @@ impl DialerActor {
     }
 }
 
-impl Actor for DialerActor {
+impl Actor for Dialer {
     type Context = Context<Self>;
 }
 
-impl Handler<NetworkPeerEvent> for DialerActor {
+impl Handler<NetworkPeerEvent> for Dialer {
     type Result = ();
 
     fn handle(&mut self, msg: NetworkPeerEvent, ctx: &mut Context<Self>) {
@@ -245,7 +245,7 @@ impl Handler<NetworkPeerEvent> for DialerActor {
     }
 }
 
-impl Handler<DialPeer> for DialerActor {
+impl Handler<DialPeer> for Dialer {
     type Result = Result<()>;
 
     fn handle(&mut self, msg: DialPeer, ctx: &mut Context<Self>) -> Self::Result {

diff --git a/packages/ciphernode/net/src/network_manager.rs b/packages/ciphernode/net/src/network_manager.rs
@@ -1,5 +1,5 @@
 use crate::correlation_id::CorrelationId;
-use crate::dialer::DialerActor;
+use crate::dialer::Dialer;
 use crate::events::{NetworkPeerCommand, NetworkPeerEvent};
 use crate::network_peer::NetworkPeer;
 
@@ -114,7 +114,7 @@ impl NetworkManager {
 
         let handle = tokio::spawn(async move { Ok(swarm_manager.start().await?) });
         for peer in peers {
-            DialerActor::dial_peer(peer, net_bus.clone(), tx.clone());
+            Dialer::dial_peer(peer, net_bus.clone(), tx.clone());
         }
 
         let p2p_addr = NetworkManager::setup(bus, net_bus, tx, &topic.to_string());