Merge pull request #542 from AmbireTech/sentry-accounting-last-approved-axum

Sentry accounting last approved axum

Author: simzzz

sentry/src/routes/channel.rs

@@ -1269,12 +1269,10 @@ mod test {
 
         // Testing for no accounting yet
         {
-            let res =
+            let accounting_response =
                 get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone()))
-                    .await;
-            assert!(res.is_ok());
-
-            let accounting_response = res.unwrap();
+                    .await
+                    .expect("shoul get accounting");
 
             assert_eq!(accounting_response.balances.earners.len(), 0);
             assert_eq!(accounting_response.balances.spenders.len(), 0);
@@ -1297,12 +1295,10 @@ mod test {
             .await
             .expect("should spend");
 
-            let res =
+            let accounting_response =
                 get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone()))
-                    .await;
-            assert!(res.is_ok());
-
-            let accounting_response = res.unwrap();
+                    .await
+                    .expect("should get accounting");
 
             assert_eq!(balances, accounting_response.balances);
         }
@@ -1333,12 +1329,10 @@ mod test {
                 .await
                 .expect("should spend");
 
-            let res =
+            let accounting_response =
                 get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone()))
-                    .await;
-            assert!(res.is_ok());
-
-            let accounting_response = res.unwrap();
+                    .await
+                    .expect("shoul get accounting");
 
             assert_eq!(balances, accounting_response.balances)
         }
@@ -1395,14 +1389,13 @@ mod test {
             Extension(channel_context.clone()),
             Path((channel_context.context.id(), *CREATOR)),
         )
-        .await;
-        assert!(res.is_ok());
-
-        let res =
-            get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone())).await;
-        assert!(res.is_ok());
+        .await
+        .expect("should get spender leaf");
 
-        let accounting_response = res.unwrap();
+        let accounting_response =
+            get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone()))
+                .await
+                .expect("should get accounting");
 
         // Making sure a new entry has been created
         assert_eq!(
@@ -1425,11 +1418,10 @@ mod test {
         .await
         .expect("should spend");
 
-        let res =
-            get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone())).await;
-        assert!(res.is_ok());
-
-        let accounting_response = res.unwrap();
+        let accounting_response =
+            get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone()))
+                .await
+                .expect("should get accounting");
 
         assert_eq!(balances, accounting_response.balances);
 
@@ -1441,11 +1433,10 @@ mod test {
         .await;
         assert!(res.is_ok());
 
-        let res =
-            get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone())).await;
-        assert!(res.is_ok());
-
-        let accounting_response = res.unwrap();
+        let accounting_response =
+            get_accounting_for_channel_axum(app.clone(), Extension(channel_context.clone()))
+                .await
+                .expect("should get accounting");
 
         // Balances shouldn't change
         assert_eq!(

sentry/src/routes/routers.rs

@@ -138,15 +138,10 @@ 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, _>)),
+            get(get_spender_limits_axum::<C>).post(add_spender_leaf_axum::<C>),
         )
-        .route(
-            "/all",
-            get(get_all_spender_limits_axum::<C>)
-                .route_layer(middleware::from_fn(authentication_required::<C, _>)),
-        );
+        .route("/all", get(get_all_spender_limits_axum::<C>))
+        .layer(middleware::from_fn(authentication_required::<C, _>));
 
     let channel_routes = Router::new()
         .route(