fix: addressed requested changes after review

near · Aug 12, 2024 · df51e49 · df51e49
1 parent bd33777
commit df51e49
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 29 deletions.
diff --git a/rpc-server/src/modules/blocks/mod.rs b/rpc-server/src/modules/blocks/mod.rs
@@ -295,31 +295,17 @@ impl BlocksInfoByFinality {
         let final_block_future = crate::utils::get_final_block(near_rpc_client, false);
         let optimistic_block_future = crate::utils::get_final_block(near_rpc_client, true);
         let validators_future = crate::utils::get_current_validators(near_rpc_client);
-        let (final_block, optimistic_block, validators) = futures::future::join3(
+
+        let (final_block, optimistic_block, validators) = futures::try_join!(
             final_block_future,
             optimistic_block_future,
             validators_future,
         )
-        .await;
-
-        let final_block = final_block
-            .map_err(|err| {
-                tracing::error!("Error to fetch final block info: {:?}", err);
-                err
-            })
-            .expect("Error to get final block info");
-        let optimistic_block = optimistic_block
-            .map_err(|err| {
-                tracing::error!("Error to fetch optimistic block info: {:?}", err);
-                err
-            })
-            .expect("Error to get optimistic block info");
-        let validators = validators
-            .map_err(|err| {
-                tracing::error!("Error to fetch validators info: {:?}", err);
-                err
-            })
-            .expect("Error to get validators info");
+        .map_err(|err| {
+            tracing::error!("Error to fetch final block info: {:?}", err);
+            err
+        })
+        .expect("Error to get final block info");
 
         blocks_cache
             .put(final_block.header.height, CacheBlock::from(&final_block))

diff --git a/rpc-server/src/modules/queries/methods.rs b/rpc-server/src/modules/queries/methods.rs
@@ -250,24 +250,22 @@ async fn view_code(
         is_optimistic
     );
     let (code, account) = if is_optimistic {
-        futures::future::join(
+        futures::try_join!(
             optimistic_view_code(data, block, account_id, "query_view_code"),
             optimistic_view_account(data, block, account_id, "query_view_code"),
-        )
-        .await
+        )?
     } else {
-        futures::future::join(
+        futures::try_join!(
             database_view_code(data, block, account_id, "query_view_code"),
             database_view_account(data, block, account_id, "query_view_code"),
-        )
-        .await
+        )?
     };
 
     Ok(near_jsonrpc::primitives::types::query::RpcQueryResponse {
         kind: near_jsonrpc::primitives::types::query::QueryResponseKind::ViewCode(
             near_primitives::views::ContractCodeView {
-                code: code?,
-                hash: account?.code_hash,
+                code,
+                hash: account.code_hash,
             },
         ),
         block_height: block.block_height,