Fix mandatory parameter in health endpoints (#869)

* write serde(default) for scalar health parameter * fix clippy
blockscout · May 8, 2024 · a345d35 · a345d35
1 parent 7af10d2
commit a345d35
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 2 deletions.
diff --git a/da-indexer/da-indexer-logic/src/celestia/repository/blobs.rs b/da-indexer/da-indexer-logic/src/celestia/repository/blobs.rs
@@ -72,7 +72,7 @@ pub async fn upsert_many<C: ConnectionTrait>(
 
 fn compute_id(height: u64, commitment: &[u8]) -> Vec<u8> {
     // commitment is not unique, but the combination of the height and commitment is
-    Sha3_256::digest([&height.to_be_bytes()[..], &commitment].concat())
+    Sha3_256::digest([&height.to_be_bytes()[..], commitment].concat())
         .as_slice()
         .to_vec()
 }
diff --git a/da-indexer/da-indexer-proto/build.rs b/da-indexer/da-indexer-proto/build.rs
@@ -18,6 +18,10 @@ fn compile(
         .bytes(["."])
         .btree_map(["."])
         .type_attribute(".", "#[actix_prost_macros::serde]")
+        .field_attribute(
+            ".blockscout.daIndexer.v1.HealthCheckRequest.service",
+            "#[serde(default)]"
+        )
         // .field_attribute(
         //     ".blockscout.daIndexer.v1.<MessageName>.<DefaultFieldName>",
         //     "#[serde(default)]"

diff --git a/sig-provider/sig-provider-proto/build.rs b/sig-provider/sig-provider-proto/build.rs
@@ -17,6 +17,10 @@ fn compile(
         .protoc_arg("grpc_api_configuration=proto/api_config_http.yaml,output_format=yaml,allow_merge=true,merge_file_name=sig-provider")
         .bytes(["."])
         .type_attribute(".", "#[actix_prost_macros::serde]")
+        .field_attribute(
+            ".blockscout.sig_provider.v1.HealthCheckRequest.service",
+            "#[serde(default)]"
+        )
         .message_attribute(".", "#[derive(Eq, Hash)]");
     config.compile_protos(protos, includes)?;
     Ok(())

diff --git a/smart-contract-verifier/smart-contract-verifier-proto/build.rs b/smart-contract-verifier/smart-contract-verifier-proto/build.rs
@@ -18,6 +18,10 @@ fn compile(
         .bytes(["."])
         .btree_map(["."])
         .type_attribute(".", "#[actix_prost_macros::serde]")
+        .field_attribute(
+            ".blockscout.smartContractVerifier.v2.HealthCheckRequest.service",
+            "#[serde(default)]"
+        )
         .field_attribute(
             ".blockscout.smartContractVerifier.v2.VerifyVyperMultiPartRequest.interfaces",
             "#[serde(default)]"

diff --git a/stats/stats-proto/build.rs b/stats/stats-proto/build.rs
@@ -17,6 +17,10 @@ fn compile(
         .protoc_arg("grpc_api_configuration=proto/api_config_http.yaml,output_format=yaml,allow_merge=true,merge_file_name=stats")
         .bytes(["."])
         .type_attribute(".", "#[actix_prost_macros::serde]")
+        .field_attribute(
+            ".blockscout.stats.v1.HealthCheckRequest.service",
+            "#[serde(default)]"
+        )
         .field_attribute(".blockscout.stats.v1.Point.is_approximate", "#[serde(skip_serializing_if = \"std::ops::Not::not\")]")
         .field_attribute(".blockscout.stats.v1.Point.is_approximate", "#[serde(default)]");
 

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/indexer/rpc_utils.rs b/user-ops-indexer/user-ops-indexer-logic/src/indexer/rpc_utils.rs
@@ -123,7 +123,7 @@ fn flatten_geth_trace(root: CallFrame) -> Vec<CommonCallTrace> {
         }
         if let Some(calls) = &frame.calls {
             if calls.len() > idx {
-                path.push((&frame, idx + 1));
+                path.push((frame, idx + 1));
                 path.push((&calls[idx], 0));
             }
         }

diff --git a/user-ops-indexer/user-ops-indexer-proto/build.rs b/user-ops-indexer/user-ops-indexer-proto/build.rs
@@ -17,6 +17,10 @@ fn compile(
         .protoc_arg("grpc_api_configuration=proto/api_config_http.yaml,output_format=yaml,allow_merge=true,merge_file_name=user-ops-indexer,json_names_for_fields=false")
         .bytes(["."])
         .type_attribute(".", "#[actix_prost_macros::serde(rename_all=\"snake_case\")]")
+        .field_attribute(
+            ".blockscout.userOpsIndexer.v1.HealthCheckRequest.service",
+            "#[serde(default)]"
+        )
         .field_attribute(".blockscout.userOpsIndexer.v1.UserOp.raw", "#[serde(rename=\"raw\")]");
 
     config.compile_protos(protos, includes)?;