graph: Rename BlockWrapper to LightEthereumBlock and fix silent truncations

- Rename BlockWrapper struct to LightEthereumBlock directly, removing
  the unnecessary type alias indirection
- Fix silent truncation in AnyBlock::number() - use try_from().unwrap()
  instead of `as BlockNumber`
- Fix silent truncation in AnyBlock::block_ptr() - route through
  From<(B256, u64)> instead of direct `as i32` cast

Author: incrypto32

graph/src/blockchain/types.rs

@@ -11,7 +11,7 @@ use std::convert::TryFrom;
 use std::time::Duration;
 use std::{fmt, str::FromStr};
 
-use crate::components::ethereum::BlockWrapper;
+use crate::components::ethereum::LightEthereumBlock;
 
 use crate::cheap_clone::CheapClone;
 use crate::components::store::BlockNumber;
@@ -200,14 +200,14 @@ impl slog::Value for BlockPtr {
     }
 }
 
-impl From<BlockWrapper> for BlockPtr {
-    fn from(b: BlockWrapper) -> BlockPtr {
+impl From<LightEthereumBlock> for BlockPtr {
+    fn from(b: LightEthereumBlock) -> BlockPtr {
         BlockPtr::from((b.hash(), b.number_u64()))
     }
 }
 
-impl From<&BlockWrapper> for BlockPtr {
-    fn from(b: &BlockWrapper) -> BlockPtr {
+impl From<&LightEthereumBlock> for BlockPtr {
+    fn from(b: &LightEthereumBlock) -> BlockPtr {
         BlockPtr::from((b.hash(), b.number_u64()))
     }
 }

graph/src/components/ethereum/mod.rs

@@ -1,8 +1,8 @@
 mod types;
 
 pub use self::types::{
-    evaluate_transaction_status, AnyBlock, AnyTransaction, BlockWrapper, EthereumBlock,
-    EthereumBlockWithCalls, EthereumCall, LightEthereumBlock, LightEthereumBlockExt,
+    evaluate_transaction_status, AnyBlock, AnyTransaction, EthereumBlock, EthereumBlockWithCalls,
+    EthereumCall, LightEthereumBlock, LightEthereumBlockExt,
 };
 
 // Re-export Alloy network types for convenience

graph/src/components/ethereum/types.rs

@@ -18,12 +18,11 @@ use crate::{
 pub type AnyTransaction = AnyRpcTransaction;
 pub type AnyBlock = AnyRpcBlock;
 
-// BlockWrapper wraps AnyBlock
 #[allow(dead_code)]
 #[derive(Debug, Deserialize, Serialize)]
-pub struct BlockWrapper(AnyBlock);
+pub struct LightEthereumBlock(AnyBlock);
 
-impl Default for BlockWrapper {
+impl Default for LightEthereumBlock {
     fn default() -> Self {
         use alloy::rpc::types::{Block, BlockTransactions};
         use alloy::serde::WithOtherFields;
@@ -38,7 +37,7 @@ impl Default for BlockWrapper {
     }
 }
 
-impl BlockWrapper {
+impl LightEthereumBlock {
     pub fn new(block: AnyBlock) -> Self {
         Self(block)
     }
@@ -68,8 +67,6 @@ impl BlockWrapper {
     }
 }
 
-pub type LightEthereumBlock = BlockWrapper;
-
 pub trait LightEthereumBlockExt {
     fn number(&self) -> BlockNumber;
     fn transaction_for_log(&self, log: &Log) -> Option<AnyTransaction>;
@@ -82,7 +79,7 @@ pub trait LightEthereumBlockExt {
 
 impl LightEthereumBlockExt for AnyBlock {
     fn number(&self) -> BlockNumber {
-        self.header.number as BlockNumber
+        BlockNumber::try_from(self.header.number).unwrap()
     }
 
     fn timestamp(&self) -> BlockTime {
@@ -124,7 +121,7 @@ impl LightEthereumBlockExt for AnyBlock {
     }
 
     fn block_ptr(&self) -> BlockPtr {
-        BlockPtr::new(self.header.hash.into(), self.header.number as i32)
+        BlockPtr::from((self.header.hash, self.header.number))
     }
 }