requested changes

Author: simzzz

sentry/src/routes.rs

@@ -237,7 +237,7 @@
 //! ```
 //!
 //!
-//! #### GET `/v5/channel/:id/get-leaf/spender` and GET `/v5/channel/:id/get-leaf/earner`
+//! #### GET `/v5/channel/:id/get-leaf
 //!
 //! This route gets the latest approved state ([`NewState`]/[`ApproveState`] pair),
 //! and finds the given `spender`/`earner` in the balances tree, and produce a merkle proof for it.
@@ -247,11 +247,11 @@
 //!
 //! Example Spender:
 //!
-//! `/get-leaf/spender/0x...`
+//! `/get-leaf/spender/0xDd589B43793934EF6Ad266067A0d1D4896b0dff0`
 //!
 //! Example Earner:
 //!
-//! `/get-leaf/earner/0x....`
+//! `/get-leaf/earner/0xE882ebF439207a70dDcCb39E13CA8506c9F45fD9`
 //!
 //! Response: [`GetLeafResponse`](primitives::sentry::GetLeafResponse)
 //!
@@ -263,6 +263,10 @@
 #![doc = include_str!("../../primitives/examples/spender_response.rs")]
 //! ```
 //!
+//! #### Subroutes:
+//! - GET `/v5/channel/:id/get-leaf/spender`
+//! - GET `/v5/channel/:id/get-leaf/earner`
+//!
 //! This module includes all routes for `Sentry` and the documentation of each Request/Response.
 //!
 //! #### POST `/v5/channel/dummy-deposit` (auth required)

sentry/src/routes/channel.rs

@@ -504,8 +504,11 @@ pub async fn channel_payout<C: Locked + 'static>(
     Ok(Json(SuccessResponse { success: true }))
 }
 
-/// GET `/v5/channel/0xXXX.../get-leaf/spender` request and
-/// GET `/v5/channel/0xXXX.../get-leaf/earner` request
+/// GET `/v5/channel/0xXXX.../get-leaf/` request
+///
+/// Subroutes:
+/// - /v5/channel/0xXXX.../get-leaf/spender
+/// - /v5/channel/0xXXX.../get-leaf/earner
 ///
 /// Response: [`GetLeafResponse`]
 pub async fn get_leaf<C: Locked + 'static>(
@@ -518,11 +521,7 @@ pub async fn get_leaf<C: Locked + 'static>(
 
     let approve_state = match latest_approve_state(&app.pool, &channel).await? {
         Some(approve_state) => approve_state,
-        None => {
-            return Err(ResponseError::BadRequest(
-                "No ApproveState message for spender".to_string(),
-            ))
-        }
+        None => return Err(ResponseError::NotFound),
     };
 
     let state_root = approve_state.msg.state_root.clone();
@@ -535,9 +534,12 @@ pub async fn get_leaf<C: Locked + 'static>(
 
     let element = match leaf_for {
         LeafFor::Spender => {
-            let amount = new_state.msg.balances.spenders.get(&addr).ok_or_else(|| {
-                ResponseError::BadRequest("No balance entry for spender!".to_string())
-            })?;
+            let amount = new_state
+                .msg
+                .balances
+                .spenders
+                .get(&addr)
+                .ok_or(ResponseError::NotFound)?;
 
             get_balance_leaf(
                 true,
@@ -546,9 +548,12 @@ pub async fn get_leaf<C: Locked + 'static>(
             )?
         }
         LeafFor::Earner => {
-            let amount = new_state.msg.balances.earners.get(&addr).ok_or_else(|| {
-                ResponseError::BadRequest("No balance entry for spender!".to_string())
-            })?;
+            let amount = new_state
+                .msg
+                .balances
+                .earners
+                .get(&addr)
+                .ok_or(ResponseError::NotFound)?;
 
             get_balance_leaf(
                 false,