Skip to content

Commit

Permalink
Use ractor's OutputPortSubscriber
Browse files Browse the repository at this point in the history
  • Loading branch information
dcadenas committed Apr 15, 2024
1 parent 51c2fcb commit e4e6d8f
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 206 deletions.
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ log = "0.4.21"
metrics = "0.22.3"
metrics-exporter-prometheus = "0.14.0"
nostr-sdk = "0.30.0"
ractor = "0.9.7"
ractor = {git = "https://github.com/slawlor/ractor", rev = "26a01d69e1d83a6d6f1cfcda668acb6deee74b13" }
regex = "1.10.4"
reqwest = "0.12.3"
serde = { version = "1.0.197", features = ["derive"] }
Expand Down
6 changes: 1 addition & 5 deletions src/actors/messages.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
use crate::actors::utilities::OutputPortSubscriber;
use crate::domain_objects::*;
use nostr_sdk::prelude::*;
use ractor::RpcReplyPort;
use ractor::{port::OutputPortSubscriber, RpcReplyPort};
use std::fmt::Debug;

#[derive(Debug)]
pub enum SupervisorMessage {
Publish(ModeratedReport),
GetNip05(PublicKey, RpcReplyPort<Option<String>>),
}

#[derive(Debug)]
pub enum RelayEventDispatcherMessage {
Connect,
Reconnect,
Expand All @@ -20,7 +17,6 @@ pub enum RelayEventDispatcherMessage {
GetNip05(PublicKey, RpcReplyPort<Option<String>>),
}

#[derive(Debug)]
pub enum GiftUnwrapperMessage {
UnwrapEvent(GiftWrappedReportRequest),
SubscribeToEventUnwrapped(OutputPortSubscriber<ReportRequest>),
Expand Down
2 changes: 1 addition & 1 deletion src/actors/relay_event_dispatcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ impl<T: NostrPort> Actor for RelayEventDispatcher<T> {
counter!("reconnect").increment(1);
}
RelayEventDispatcherMessage::SubscribeToEventReceived(subscriber) => {
info!("Subscribing: {:?} to {:?}", subscriber, myself.get_name());
info!("Subscribing to {:?}", myself.get_name());
subscriber.subscribe_to_port(&state.event_received_output_port);
}
RelayEventDispatcherMessage::EventReceived(event) => {
Expand Down
3 changes: 0 additions & 3 deletions src/actors/utilities.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
pub mod output_port_subscriber;
pub use output_port_subscriber::OutputPortSubscriber;

#[cfg(test)]
pub mod test_actor;
#[cfg(test)]
Expand Down
194 changes: 0 additions & 194 deletions src/actors/utilities/output_port_subscriber.rs

This file was deleted.

0 comments on commit e4e6d8f

Please sign in to comment.