diff --git a/src/event.rs b/src/event.rs index 75f25a7..ef173c1 100644 --- a/src/event.rs +++ b/src/event.rs @@ -472,12 +472,8 @@ mod tests { let mut event = Event::simple_event(); event.tags = vec![vec!["e".to_owned(), "foo".to_owned()]]; event.build_index(); - assert!( - event.generic_tag_val_intersect( - 'e', - &HashSet::from(["foo".to_owned(), "bar".to_owned()]) - ) - ); + assert!(event + .generic_tag_val_intersect('e', &HashSet::from(["foo".to_owned(), "bar".to_owned()]))); } #[test] diff --git a/src/notice.rs b/src/notice.rs index 6875de9..ec51277 100644 --- a/src/notice.rs +++ b/src/notice.rs @@ -25,7 +25,9 @@ impl EventResultStatus { pub fn to_bool(&self) -> bool { match self { Self::Duplicate | Self::Saved => true, - Self::Invalid | Self::Blocked | Self::RateLimited | Self::Error | Self::Restricted => false, + Self::Invalid | Self::Blocked | Self::RateLimited | Self::Error | Self::Restricted => { + false + } } } diff --git a/src/server.rs b/src/server.rs index 52fb328..0a0265c 100644 --- a/src/server.rs +++ b/src/server.rs @@ -202,7 +202,7 @@ async fn handle_web_request( .header("Content-Type", "text/html; charset=UTF-8") .body(Body::from(file_content)) .expect("request builder")); - }, + } Err(err) => { error!("Failed to read relay_page file: {}. Will use default", err); } @@ -920,7 +920,7 @@ pub fn start_server(settings: &Settings, shutdown_rx: MpscReceiver<()>) -> Resul info!("starting payment process ..."); p.run().await; }); - }, + } Err(e) => { error!("Failed to start payment process {e}"); std::process::exit(1); diff --git a/src/subscription.rs b/src/subscription.rs index 9f97ce8..b02a6b0 100644 --- a/src/subscription.rs +++ b/src/subscription.rs @@ -45,8 +45,8 @@ pub struct ReqFilter { impl Serialize for ReqFilter { fn serialize(&self, serializer: S) -> Result - where - S: Serializer, + where + S: Serializer, { let mut map = serializer.serialize_map(None)?; if let Some(ids) = &self.ids { @@ -80,8 +80,8 @@ impl Serialize for ReqFilter { impl<'de> Deserialize<'de> for ReqFilter { fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, + where + D: Deserializer<'de>, { let received: Value = Deserialize::deserialize(deserializer)?; let filter = received.as_object().ok_or_else(|| { @@ -184,8 +184,8 @@ impl<'de> Deserialize<'de> for Subscription { /// Custom deserializer for subscriptions, which have a more /// complex structure than the other message types. fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, + where + D: Deserializer<'de>, { let mut v: Value = Deserialize::deserialize(deserializer)?; // this should be a 3-or-more element array. @@ -673,11 +673,26 @@ mod tests { #[test] fn is_scraper() -> Result<()> { - assert!(serde_json::from_str::(r#"["REQ","some-id",{"kinds": [1984],"since": 123,"limit":1}]"#)?.is_scraper()); - assert!(serde_json::from_str::(r#"["REQ","some-id",{"kinds": [1984]},{"kinds": [1984],"authors":["aaaa"]}]"#)?.is_scraper()); - assert!(!serde_json::from_str::(r#"["REQ","some-id",{"kinds": [1984],"authors":["aaaa"]}]"#)?.is_scraper()); - assert!(!serde_json::from_str::(r#"["REQ","some-id",{"ids": ["aaaa"]}]"#)?.is_scraper()); - assert!(!serde_json::from_str::(r##"["REQ","some-id",{"#p": ["aaaa"],"kinds":[1,4]}]"##)?.is_scraper()); + assert!(serde_json::from_str::( + r#"["REQ","some-id",{"kinds": [1984],"since": 123,"limit":1}]"# + )? + .is_scraper()); + assert!(serde_json::from_str::( + r#"["REQ","some-id",{"kinds": [1984]},{"kinds": [1984],"authors":["aaaa"]}]"# + )? + .is_scraper()); + assert!(!serde_json::from_str::( + r#"["REQ","some-id",{"kinds": [1984],"authors":["aaaa"]}]"# + )? + .is_scraper()); + assert!( + !serde_json::from_str::(r#"["REQ","some-id",{"ids": ["aaaa"]}]"#)? + .is_scraper() + ); + assert!(!serde_json::from_str::( + r##"["REQ","some-id",{"#p": ["aaaa"],"kinds":[1,4]}]"## + )? + .is_scraper()); Ok(()) } }