fix(comments)

madara-alliance · antiyro · Oct 3, 2024 · Sep 6, 2024 · Sep 19, 2024 · Sep 20, 2024
commit ae92369fcba84400e2256e73e52fb61f72923485
diff --git a/crates/client/gateway/src/client/request_builder.rs b/crates/client/gateway/src/client/request_builder.rs
@@ -104,6 +104,5 @@ where
         return Err(error);
     }
 
-    response.error_for_status_ref().map(|_| ())?;
     Ok(response.json::<T>().await?)
 }
diff --git a/crates/client/gateway/src/server/error.rs b/crates/client/gateway/src/server/error.rs
@@ -17,7 +17,7 @@ pub enum GatewayError {
 
 impl From<MadaraStorageError> for GatewayError {
     fn from(e: MadaraStorageError) -> Self {
-        log::error!("Storage error: {}", e);
+        log::error!(target: "gateway_errors", "Storage error: {}", e);
         Self::InternalServerError
     }
 }

diff --git a/crates/client/gateway/src/server/router.rs b/crates/client/gateway/src/server/router.rs
@@ -28,9 +28,15 @@ pub(crate) async fn main_router(
 // Router for requests related to feeder_gateway
 async fn feeder_gateway_router(req: Request<Body>, backend: Arc<MadaraBackend>) -> Result<Response<Body>, Infallible> {
     match (req.method(), req.uri().path()) {
-        (&Method::GET, "/feeder_gateway/get_block") => Ok(handle_get_block(req, backend).await),
-        (&Method::GET, "/feeder_gateway/get_state_update") => Ok(handle_get_state_update(req, backend).await),
-        (&Method::GET, "/feeder_gateway/get_class_by_hash") => Ok(handle_get_class_by_hash(req, backend).await),
+        (&Method::GET, "/feeder_gateway/get_block") => {
+            Ok(handle_get_block(req, backend).await.unwrap_or_else(Into::into))
+        }
+        (&Method::GET, "/feeder_gateway/get_state_update") => {
+            Ok(handle_get_state_update(req, backend).await.unwrap_or_else(Into::into))
+        }
+        (&Method::GET, "/feeder_gateway/get_class_by_hash") => {
+            Ok(handle_get_class_by_hash(req, backend).await.unwrap_or_else(Into::into))
+        }
         _ => Ok(not_found_response()),
     }
 }
@@ -41,7 +47,9 @@ async fn gateway_router(
     add_transaction_provider: Arc<dyn AddTransactionProvider>,
 ) -> Result<Response<Body>, Infallible> {
     match (req.method(), req.uri().path()) {
-        (&Method::POST, "/feeder/add_transaction") => Ok(handle_add_transaction(req, add_transaction_provider).await),
+        (&Method::POST, "/feeder/add_transaction") => {
+            Ok(handle_add_transaction(req, add_transaction_provider).await.unwrap_or_else(Into::into))
+        }
         _ => Ok(not_found_response()),
     }
 }
diff --git a/crates/primitives/block/src/lib.rs b/crates/primitives/block/src/lib.rs
@@ -2,6 +2,8 @@
 
 pub mod header;
 
+use std::fmt::Display;
+
 pub use header::Header;
 use header::PendingHeader;
 use mp_chain_config::StarknetVersion;
@@ -126,6 +128,18 @@ impl From<BlockId> for starknet_core::types::BlockId {
         }
     }
 }
+impl Display for BlockId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            BlockId::Hash(hash) => write!(f, "0x{hash:x}"),
+            BlockId::Number(number) => write!(f, "{number}"),
+            BlockId::Tag(blocktag) => match blocktag {
+                BlockTag::Latest => write!(f, "latest"),
+                BlockTag::Pending => write!(f, "pending"),
+            },
+        }
+    }
+}
 
 // Light version of the block with block_hash
 #[derive(Clone, Debug, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]

diff --git a/crates/primitives/gateway/src/test.rs b/crates/primitives/gateway/src/test.rs
@@ -1,24 +1,16 @@
-
-
-
-
-
-
 #[cfg(test)]
-mod tests {
-    use std::fmt::Debug;
+use std::fmt::Debug;
 
-    use serde::de::DeserializeOwned;
+use serde::de::DeserializeOwned;
 
-    use super::*;
+use super::*;
 
-    fn test_serialize_deserialize<T>(value: T) -> T
-    where
-        T: Serialize + DeserializeOwned + Clone + Debug + PartialEq,
-    {
-        let serialized = serde_json::to_string(&value).unwrap();
-        let deserialized: T = serde_json::from_str(&serialized).unwrap();
-        assert_eq!(value, deserialized);
-        deserialized
-    }
-}
+fn test_serialize_deserialize<T>(value: T) -> T
+where
+    T: Serialize + DeserializeOwned + Clone + Debug + PartialEq,
+{
+    let serialized = serde_json::to_string(&value).unwrap();
+    let deserialized: T = serde_json::from_str(&serialized).unwrap();
+    assert_eq!(value, deserialized);
+    deserialized
+}