remove duplicate filter types

only use nostrdb::Filter

Signed-off-by: William Casarin <jb55@jb55.com>

enostr/src/relay/message.rs

@@ -161,7 +161,7 @@ mod tests {
 
     #[test]
     fn test_handle_valid_event() -> Result<()> {
-        use log::debug;
+        use tracing::debug;
 
         env_logger::init();
         let valid_event_msg = r#"["EVENT", "random_string", {"id":"70b10f70c1318967eddf12527799411b1a9780ad9c43858f5e5fcd45486a13a5","pubkey":"379e863e8357163b5bce5d2688dc4f1dcc2d505222fb8d74db600f30535dfdfe","created_at":1612809991,"kind":1,"tags":[],"content":"test","sig":"273a9cd5d11455590f4359500bccb7a89428262b96b3ea87a756b770964472f8c3e87f5d5e64d8d2e859a71462a3f477b554565c4f2f326cb01dd7620db71502"}]"#;

enostr/src/relay/mod.rs

@@ -1,9 +1,10 @@
 use ewebsock::{WsMessage, WsReceiver, WsSender};
 
-use crate::{ClientMessage, Filter, Result};
-use log::info;
+use crate::{ClientMessage, Result};
+use nostrdb::Filter;
 use std::fmt;
 use std::hash::{Hash, Hasher};
+use tracing::{debug, error, info};
 
 pub mod message;
 pub mod pool;
@@ -60,7 +61,18 @@ impl Relay {
     }
 
     pub fn send(&mut self, msg: &ClientMessage) {
-        let txt = WsMessage::Text(msg.to_json());
+        let json = match msg.to_json() {
+            Ok(json) => {
+                debug!("sending {} to {}", json, self.url);
+                json
+            }
+            Err(e) => {
+                error!("error serializing json for filter: {e}");
+                return;
+            }
+        };
+
+        let txt = WsMessage::Text(json);
         self.sender.send(txt);
     }
 

enostr/src/relay/pool.rs

@@ -1,5 +1,6 @@
 use crate::relay::{Relay, RelayStatus};
 use crate::{ClientMessage, Result};
+use nostrdb::Filter;
 
 use std::time::{Duration, Instant};
 
@@ -71,6 +72,12 @@ impl RelayPool {
         }
     }
 
+    pub fn subscribe(&mut self, subid: String, filter: Vec<Filter>) {
+        for relay in &mut self.relays {
+            relay.relay.subscribe(subid.clone(), filter.clone());
+        }
+    }
+
     /// Keep relay connectiongs alive by pinging relays that haven't been
     /// pinged in awhile. Adjust ping rate with [`ping_rate`].
     pub fn keepalive_ping(&mut self, wakeup: impl Fn() + Send + Sync + Clone + 'static) {