From dad69118074d56d0e70873a8444ba0d88d9e2a18 Mon Sep 17 00:00:00 2001 From: Greg Heartsfield Date: Mon, 3 Jul 2023 10:31:22 -0500 Subject: [PATCH] refactor: clippy suggestions --- src/conn.rs | 2 +- src/db.rs | 6 +++--- src/event.rs | 5 ++--- src/nauthz.rs | 12 ++++++------ src/payment/lnbits.rs | 2 +- src/repo/sqlite.rs | 12 ++++++------ src/server.rs | 22 ++++++++++------------ src/utils.rs | 6 +++--- tests/conn.rs | 6 +++--- 9 files changed, 35 insertions(+), 38 deletions(-) diff --git a/src/conn.rs b/src/conn.rs index a0cd485..28e6a65 100644 --- a/src/conn.rs +++ b/src/conn.rs @@ -204,7 +204,7 @@ impl ClientConn { } } - match (relay.and_then(|url| host_str(url)), host_str(relay_url)) { + match (relay.and_then(host_str), host_str(relay_url)) { (Some(received_relay), Some(our_relay)) => { if received_relay != our_relay { return Err(Error::AuthFailure); diff --git a/src/db.rs b/src/db.rs index 27aafaf..7526452 100644 --- a/src/db.rs +++ b/src/db.rs @@ -45,8 +45,8 @@ pub const DB_FILE: &str = "nostr.db"; /// Will panic if the pool could not be created. pub async fn build_repo(settings: &Settings, metrics: NostrMetrics) -> Arc { match settings.database.engine.as_str() { - "sqlite" => Arc::new(build_sqlite_pool(&settings, metrics).await), - "postgres" => Arc::new(build_postgres_pool(&settings, metrics).await), + "sqlite" => Arc::new(build_sqlite_pool(settings, metrics).await), + "postgres" => Arc::new(build_postgres_pool(settings, metrics).await), _ => panic!("Unknown database engine"), } } @@ -378,7 +378,7 @@ pub async fn db_writer( notice_tx .try_send(Notice::blocked( event.id, - &decision.message().unwrap_or_else(|| "".to_string()), + &decision.message().unwrap_or_default(), )) .ok(); continue; diff --git a/src/event.rs b/src/event.rs index 6d16fc3..a0f5d5b 100644 --- a/src/event.rs +++ b/src/event.rs @@ -472,12 +472,11 @@ mod tests { let mut event = Event::simple_event(); event.tags = vec![vec!["e".to_owned(), "foo".to_owned()]]; event.build_index(); - assert_eq!( + assert!( event.generic_tag_val_intersect( 'e', &HashSet::from(["foo".to_owned(), "bar".to_owned()]) - ), - true + ) ); } diff --git a/src/nauthz.rs b/src/nauthz.rs index 1d8caad..d16ca80 100644 --- a/src/nauthz.rs +++ b/src/nauthz.rs @@ -35,7 +35,7 @@ impl std::convert::From for nauthz_grpc::event_request::Nip05Name { fn from(value: Nip05Name) -> Self { nauthz_grpc::event_request::Nip05Name { local: value.local.clone(), - domain: value.domain.clone(), + domain: value.domain, } } } @@ -57,7 +57,7 @@ impl EventAuthzService { eas } - pub async fn ready_connection(self: &mut Self) { + pub async fn ready_connection(&mut self) { if self.conn.is_none() { let client = AuthorizationClient::connect(self.server_addr.to_string()).await; if let Err(ref msg) = client { @@ -70,7 +70,7 @@ impl EventAuthzService { } pub async fn admit_event( - self: &mut Self, + &mut self, event: &Event, ip: &str, origin: Option, @@ -99,13 +99,13 @@ impl EventAuthzService { origin, user_agent, auth_pubkey, - nip05: nip05.map(|x| nauthz_grpc::event_request::Nip05Name::from(x)), + nip05: nip05.map(nauthz_grpc::event_request::Nip05Name::from), }) .await?; let reply = svr_res.into_inner(); - return Ok(Box::new(reply)); + Ok(Box::new(reply)) } else { - return Err(Error::AuthzError); + Err(Error::AuthzError) } } } diff --git a/src/payment/lnbits.rs b/src/payment/lnbits.rs index 055882e..9863243 100644 --- a/src/payment/lnbits.rs +++ b/src/payment/lnbits.rs @@ -110,7 +110,7 @@ impl PaymentProcessor for LNBitsPaymentProcessor { expiry: 3600, }; let url = Url::parse(&self.settings.pay_to_relay.node_url)?.join(APIPATH)?; - let uri = Uri::from_str(url.as_str().strip_suffix("/").unwrap_or(url.as_str())).unwrap(); + let uri = Uri::from_str(url.as_str().strip_suffix('/').unwrap_or(url.as_str())).unwrap(); let req = hyper::Request::builder() .method(hyper::Method::POST) diff --git a/src/repo/sqlite.rs b/src/repo/sqlite.rs index 6c17c97..87d8556 100644 --- a/src/repo/sqlite.rs +++ b/src/repo/sqlite.rs @@ -842,7 +842,8 @@ impl NostrRepo for SqliteRepo { async fn update_invoice(&self, payment_hash: &str, status: InvoiceStatus) -> Result { let mut conn = self.write_pool.get()?; let payment_hash = payment_hash.to_owned(); - let pub_key = tokio::task::spawn_blocking(move || { + + tokio::task::spawn_blocking(move || { let tx = conn.transaction()?; let pubkey: String; { @@ -884,8 +885,7 @@ impl NostrRepo for SqliteRepo { let ok: Result = Ok(pubkey); ok }) - .await?; - pub_key + .await? } /// Get the most recent invoice for a given pubkey @@ -1080,18 +1080,18 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec>, Option {}", f.since.unwrap()); } else { - since_clause = format!(""); + since_clause = String::new(); }; // Query for timestamp if f.until.is_some() { until_clause = format!("AND created_at < {}", f.until.unwrap()); } else { - until_clause = format!(""); + until_clause = String::new(); }; let tag_clause = format!( diff --git a/src/server.rs b/src/server.rs index 2722e40..1fd0cd5 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1125,8 +1125,8 @@ async fn nostr_server( let unspec = "".to_string(); info!("new client connection (cid: {}, ip: {:?})", cid, conn.ip()); - let origin = client_info.origin.as_ref().unwrap_or_else(|| &unspec); - let user_agent = client_info.user_agent.as_ref().unwrap_or_else(|| &unspec); + let origin = client_info.origin.as_ref().unwrap_or(&unspec); + let user_agent = client_info.user_agent.as_ref().unwrap_or(&unspec); info!( "cid: {}, origin: {:?}, user-agent: {:?}", cid, origin, user_agent @@ -1175,14 +1175,12 @@ async fn nostr_server( if query_result.event == "EOSE" { let send_str = format!("[\"EOSE\",\"{subesc}\"]"); ws_stream.send(Message::Text(send_str)).await.ok(); - } else { - if allowed_to_send(&query_result.event, &conn, &settings) { - metrics.sent_events.with_label_values(&["db"]).inc(); - client_received_event_count += 1; - // send a result - let send_str = format!("[\"EVENT\",\"{}\",{}]", subesc, &query_result.event); - ws_stream.send(Message::Text(send_str)).await.ok(); - } + } else if allowed_to_send(&query_result.event, &conn, &settings) { + metrics.sent_events.with_label_values(&["db"]).inc(); + client_received_event_count += 1; + // send a result + let send_str = format!("[\"EVENT\",\"{}\",{}]", subesc, &query_result.event); + ws_stream.send(Message::Text(send_str)).await.ok(); } }, // TODO: consider logging the LaggedRecv error @@ -1278,7 +1276,7 @@ async fn nostr_server( // check if the event is too far in the future. } else if e.is_valid_timestamp(settings.options.reject_future_seconds) { // Write this to the database. - let auth_pubkey = conn.auth_pubkey().and_then(|pubkey| hex::decode(&pubkey).ok()); + let auth_pubkey = conn.auth_pubkey().and_then(|pubkey| hex::decode(pubkey).ok()); let submit_event = SubmittedEvent { event: e.clone(), notice_tx: notice_tx.clone(), @@ -1307,7 +1305,7 @@ async fn nostr_server( error!("AUTH command received, but relay_url is not set in the config file (cid: {})", cid); }, Some(relay) => { - match conn.authenticate(&event, &relay) { + match conn.authenticate(&event, relay) { Ok(_) => { let pubkey = match conn.auth_pubkey() { Some(k) => k.chars().take(8).collect(), diff --git a/src/utils.rs b/src/utils.rs index b037c97..b70403e 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -50,15 +50,15 @@ mod tests { #[test] fn lower_hex() { let hexstr = "abcd0123"; - assert_eq!(is_lower_hex(hexstr), true); + assert!(is_lower_hex(hexstr)); } #[test] fn nip19() { let hexkey = "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"; let nip19key = "npub180cvv07tjdrrgpa0j7j7tmnyl2yr6yr7l8j4s3evf6u64th6gkwsyjh6w6"; - assert_eq!(is_nip19(hexkey), false); - assert_eq!(is_nip19(nip19key), true); + assert!(!is_nip19(hexkey)); + assert!(is_nip19(nip19key)); } #[test] diff --git a/tests/conn.rs b/tests/conn.rs index 9a12859..b6d7bcf 100644 --- a/tests/conn.rs +++ b/tests/conn.rs @@ -334,9 +334,9 @@ mod tests { id: "0".to_owned(), pubkey: public_key.to_hex(), delegated_by: None, - created_at: created_at, - kind: kind, - tags: tags, + created_at, + kind, + tags, content: "".to_owned(), sig: "0".to_owned(), tagidx: None,