clippy + formatting

Author: simzzz

sentry/src/routes/channel.rs

@@ -19,7 +19,7 @@ use crate::{
     Application, Auth,
 };
 use adapter::{client::Locked, Adapter, Dummy};
-use axum::{Extension, Json, extract::Path};
+use axum::{extract::Path, Extension, Json};
 use futures::future::try_join_all;
 use hyper::{Body, Request, Response};
 use primitives::{
@@ -275,7 +275,9 @@ pub async fn get_spender_limits_axum<C: Locked + 'static>(
 ) -> Result<Json<SpenderResponse>, ResponseError> {
     let channel = &channel_context.context;
 
-    let spender = params.get("addr").ok_or(ResponseError::BadRequest("Invalid spender address".to_string()))?;
+    let spender = params.get("addr").ok_or_else(|| ResponseError::BadRequest(
+        "Invalid spender address".to_string(),
+    ))?;
     let spender = Address::from_str(spender)?;
 
     let latest_spendable = fetch_spendable(app.pool.clone(), &spender, &channel.id()).await?;
@@ -295,12 +297,14 @@ pub async fn get_spender_limits_axum<C: Locked + 'static>(
 
     let new_state = match get_corresponding_new_state(&app.pool, &app.logger, channel).await? {
         Some(new_state) => new_state,
-        None => return Ok(Json(SpenderResponse {
-            spender: Spender {
-                total_deposited: latest_spendable.deposit.total,
-                total_spent: None,
-            },
-        })),
+        None => {
+            return Ok(Json(SpenderResponse {
+                spender: Spender {
+                    total_deposited: latest_spendable.deposit.total,
+                    total_spent: None,
+                },
+            }))
+        }
     };
 
     let total_spent = new_state
@@ -379,7 +383,7 @@ pub async fn get_all_spender_limits<C: Locked + 'static>(
 pub async fn get_all_spender_limits_axum<C: Locked + 'static>(
     Extension(app): Extension<Arc<Application<C>>>,
     Extension(channel_context): Extension<ChainOf<Channel>>,
-    Qs(query): Qs<AllSpendersQuery>
+    Qs(query): Qs<AllSpendersQuery>,
 ) -> Result<Json<AllSpendersResponse>, ResponseError> {
     let channel = channel_context.context;
 
@@ -493,7 +497,9 @@ pub async fn add_spender_leaf_axum<C: Locked + 'static>(
     Extension(app): Extension<Arc<Application<C>>>,
     Extension(channel): Extension<ChainOf<Channel>>,
 ) -> Result<Json<SpenderResponse>, ResponseError> {
-    let spender = params.get("addr").ok_or(ResponseError::BadRequest("Invalid spender address".to_string()))?;
+    let spender = params.get("addr").ok_or_else(|| ResponseError::BadRequest(
+        "Invalid spender address".to_string(),
+    ))?;
     let spender = Address::from_str(spender)?;
 
     update_accounting(
@@ -519,12 +525,14 @@ pub async fn add_spender_leaf_axum<C: Locked + 'static>(
     let new_state =
         match get_corresponding_new_state(&app.pool, &app.logger, &channel.context).await? {
             Some(new_state) => new_state,
-            None => return Ok(Json(SpenderResponse {
-                spender: Spender {
-                    total_deposited: latest_spendable.deposit.total,
-                    total_spent: None,
-                },
-            })),
+            None => {
+                return Ok(Json(SpenderResponse {
+                    spender: Spender {
+                        total_deposited: latest_spendable.deposit.total,
+                        total_spent: None,
+                    },
+                }))
+            }
         };
 
     let total_spent = new_state

sentry/src/routes/routers.rs

@@ -27,9 +27,10 @@ use crate::{
         campaign,
         campaign::{campaign_list, create_campaign, update_campaign},
         channel::{
-            add_spender_leaf, channel_dummy_deposit, channel_list, channel_payout,
-            get_accounting_for_channel, get_all_spender_limits, get_spender_limits, last_approved,
-            get_spender_limits_axum, get_all_spender_limits_axum, add_spender_leaf_axum,
+            add_spender_leaf, add_spender_leaf_axum, channel_dummy_deposit, channel_list,
+            channel_payout, get_accounting_for_channel, get_all_spender_limits,
+            get_all_spender_limits_axum, get_spender_limits, get_spender_limits_axum,
+            last_approved,
             validator_message::{
                 create_validator_messages, extract_params, list_validator_messages,
             },
@@ -135,10 +136,17 @@ async fn if_dummy_adapter<C: Locked + 'static, B>(
 
 pub fn channels_router_axum<C: Locked + 'static>() -> Router {
     let spender_routes = Router::new()
-    .route(
-        "/:addr", get(get_spender_limits_axum::<C>).post(add_spender_leaf_axum::<C>).route_layer(middleware::from_fn(authentication_required::<C, _>))
-    )
-    .route("/all", get(get_all_spender_limits_axum::<C>).route_layer(middleware::from_fn(authentication_required::<C, _>)));
+        .route(
+            "/:addr",
+            get(get_spender_limits_axum::<C>)
+                .post(add_spender_leaf_axum::<C>)
+                .route_layer(middleware::from_fn(authentication_required::<C, _>)),
+        )
+        .route(
+            "/all",
+            get(get_all_spender_limits_axum::<C>)
+                .route_layer(middleware::from_fn(authentication_required::<C, _>)),
+        );
 
     let channel_routes = Router::new()
         .route(