graph: Rename to_light_block, add to_json on CachedBlock

Author: incrypto32

chain/ethereum/src/ethereum_adapter.rs

@@ -1639,8 +1639,8 @@ impl EthereumAdapterTrait for EthereumAdapter {
             .await
             .map_err(|e| error!(&logger, "Error accessing block cache {}", e))
             .unwrap_or_default()
-            .into_iter()
-            .map(|b| b.into_light_block())
+            .iter()
+            .map(|b| b.to_light_block())
             .collect();
 
         let missing_blocks = Vec::from_iter(

graph/src/components/ethereum/types.rs

@@ -278,7 +278,7 @@ impl CachedBlock {
         }
     }
 
-    pub fn into_light_block(&self) -> Arc<LightEthereumBlock> {
+    pub fn to_light_block(&self) -> Arc<LightEthereumBlock> {
         match self {
             CachedBlock::Full(block) => block.block.clone(),
             CachedBlock::Light(block) => block.clone(),
@@ -292,6 +292,13 @@ impl CachedBlock {
         }
     }
 
+    pub fn to_json(&self) -> serde_json::Result<serde_json::Value> {
+        match self {
+            CachedBlock::Full(b) => serde_json::to_value(b),
+            CachedBlock::Light(b) => serde_json::to_value(b),
+        }
+    }
+
     /// Deserializes a JSON block from the store into a typed `CachedBlock`.
     /// Returns `None` for shallow (header-only) blocks.
     ///

server/index-node/src/resolver.rs

@@ -9,7 +9,6 @@ use graph::schema::EntityType;
 use git_testament::{git_testament, CommitKind};
 use graph::amp;
 use graph::blockchain::{Blockchain, BlockchainKind, BlockchainMap};
-use graph::components::ethereum::CachedBlock;
 use graph::components::link_resolver::LinkResolverContext;
 use graph::components::store::{BlockPtrForNumber, BlockStore, QueryPermit, Store};
 use graph::components::versions::VERSIONS;
@@ -237,10 +236,7 @@ where
             Ok(mut blocks) => {
                 assert!(blocks.len() == 1, "Multiple blocks with the same hash");
                 let block = blocks.pop().unwrap();
-                let json = match block {
-                    CachedBlock::Full(ref b) => serde_json::to_value(b),
-                    CachedBlock::Light(ref b) => serde_json::to_value(b),
-                };
+                let json = block.to_json();
                 match json {
                     Ok(json) => json.into(),
                     Err(e) => {