Tidy up

sigp · Apr 11, 2022 · 96ae578 · 96ae578
1 parent efbe421
commit 96ae578
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/beacon_node/http_api/src/block_id.rs b/beacon_node/http_api/src/block_id.rs
@@ -117,7 +117,7 @@ impl BlockId {
     }
 
     /// Returns the `block` along with the `execution_optimistic` value identified by `self`.
-    pub fn block_and_is_execution_optimistic<T: BeaconChainTypes>(
+    pub fn block_and_execution_optimistic<T: BeaconChainTypes>(
         &self,
         chain: &BeaconChain<T>,
     ) -> Result<(SignedBeaconBlock<T::EthSpec>, bool), warp::Rejection> {
@@ -139,6 +139,15 @@ impl BlockId {
         };
         Ok((block, execution_optimistic))
     }
+
+    /// Convenience function to compute `execution_optimistic` when `block` is not desired.
+    pub fn is_execution_optimistic<T: BeaconChainTypes>(
+        &self,
+        chain: &BeaconChain<T>,
+    ) -> Result<bool, warp::Rejection> {
+        self.block_and_execution_optimistic(chain)
+            .map(|(_, execution_optimistic)| execution_optimistic)
+    }
 }
 
 impl FromStr for BlockId {

diff --git a/beacon_node/http_api/src/lib.rs b/beacon_node/http_api/src/lib.rs
@@ -978,7 +978,7 @@ pub fn serve<T: BeaconChainTypes>(
             blocking_json_task(move || {
                 let root = block_id.root(&chain)?;
                 let (block, execution_optimistic) =
-                    BlockId::from_root(root).block_and_is_execution_optimistic(&chain)?;
+                    BlockId::from_root(root).block_and_execution_optimistic(&chain)?;
 
                 let canonical = chain
                     .block_root_at_slot(block.slot(), WhenSlotSkipped::None)
@@ -1245,7 +1245,7 @@ pub fn serve<T: BeaconChainTypes>(
              accept_header: Option<api_types::Accept>| {
                 blocking_task(move || {
                     let (block, execution_optimistic) =
-                        block_id.block_and_is_execution_optimistic(&chain)?;
+                        block_id.block_and_execution_optimistic(&chain)?;
                     let fork_name = block
                         .fork_name(&chain.spec)
                         .map_err(inconsistent_fork_rejection)?;
@@ -1282,7 +1282,7 @@ pub fn serve<T: BeaconChainTypes>(
         .and_then(|block_id: BlockId, chain: Arc<BeaconChain<T>>| {
             blocking_json_task(move || {
                 let (block, execution_optimistic) =
-                    block_id.block_and_is_execution_optimistic(&chain)?;
+                    block_id.block_and_execution_optimistic(&chain)?;
 
                 Ok(api_types::GenericResponse::from(api_types::RootData::from(
                     block.canonical_root(),
@@ -1299,7 +1299,7 @@ pub fn serve<T: BeaconChainTypes>(
         .and_then(|block_id: BlockId, chain: Arc<BeaconChain<T>>| {
             blocking_json_task(move || {
                 let (block, execution_optimistic) =
-                    block_id.block_and_is_execution_optimistic(&chain)?;
+                    block_id.block_and_execution_optimistic(&chain)?;
 
                 Ok(
                     api_types::GenericResponse::from(block.message().body().attestations().clone())
@@ -1770,8 +1770,7 @@ pub fn serve<T: BeaconChainTypes>(
                                 None
                             } else if endpoint_version == V2 {
                                 BlockId::from_root(root)
-                                    .block_and_is_execution_optimistic(&chain)
-                                    .map(|(_, execution_optimistic)| execution_optimistic)
+                                    .is_execution_optimistic(&chain)
                                     .ok()
                             } else {
                                 return Err(unsupported_version_rejection(endpoint_version));

diff --git a/beacon_node/http_api/src/state_id.rs b/beacon_node/http_api/src/state_id.rs
@@ -181,7 +181,7 @@ impl StateId {
         func(&state, execution_optimistic)
     }
 
-    /// Convienience function to compute `execution_optimistic` when `state` is not desired.
+    /// Convenience function to compute `execution_optimistic` when `state` is not desired.
     pub fn is_execution_optimistic<T: BeaconChainTypes>(
         &self,
         chain: &BeaconChain<T>,