minor refactoring

Author: incrypto32

chain/ethereum/src/chain.rs

@@ -1108,7 +1108,7 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
                     .load_blocks(
                         self.logger.cheap_clone(),
                         self.chain_store.cheap_clone(),
-                        HashSet::from_iter(Some(block.hash_as_b256())),
+                        HashSet::from_iter(Some(block.hash.as_b256())),
                     )
                     .await?;
                 assert_eq!(blocks.len(), 1);

chain/ethereum/src/ethereum_adapter.rs

@@ -39,7 +39,6 @@ use graph::prelude::{
         },
         transports::{RpcError, TransportErrorKind},
     },
-    alloy_log_to_web3_log, h256_to_b256,
     tokio::try_join,
 };
 use graph::slog::o;
@@ -568,7 +567,7 @@ impl EthereumAdapter {
         if !self.supports_eip_1898 {
             alloy::rpc::types::BlockId::number(block_ptr.number as u64)
         } else {
-            alloy::rpc::types::BlockId::hash(block_ptr.hash_as_b256())
+            alloy::rpc::types::BlockId::hash(block_ptr.hash.as_b256())
         }
     }
 
@@ -1692,7 +1691,7 @@ pub(crate) async fn blocks_with_triggers(
     debug!(logger, "Finding nearest valid `to` block to {}", to);
 
     let to_ptr = eth.next_existing_ptr_to_number(&logger, to).await?;
-    let to_hash = to_ptr.hash_as_b256();
+    let to_hash = to_ptr.hash.as_b256();
     let to = to_ptr.block_number();
 
     // This is for `start` triggers which can be initialization handlers which needs to be run
@@ -2077,7 +2076,7 @@ async fn filter_call_triggers_from_unsuccessful_transactions(
     // We'll also need the receipts for those transactions. In this step we collect all receipts
     // we have in store for the current block.
     let mut receipts: BTreeMap<B256, LightTransactionReceipt> = chain_store
-        .transaction_receipts_in_block(&block.ptr().hash_as_b256())
+        .transaction_receipts_in_block(&block.ptr().hash.as_b256())
         .await?
         .into_iter()
         .map(|receipt| (receipt.transaction_hash, receipt))

chain/ethereum/src/trigger.rs

@@ -308,7 +308,7 @@ impl EthereumTrigger {
 
     pub fn block_hash(&self) -> B256 {
         match self {
-            EthereumTrigger::Block(block_ptr, _) => block_ptr.hash_as_b256(),
+            EthereumTrigger::Block(block_ptr, _) => block_ptr.hash.as_b256(),
             EthereumTrigger::Call(call) => call.block_hash,
             EthereumTrigger::Log(log_ref) => log_ref.block_hash().unwrap(),
         }

chain/near/src/trigger.rs

@@ -80,8 +80,8 @@ impl NearTrigger {
 
     pub fn block_hash(&self) -> B256 {
         match self {
-            NearTrigger::Block(block) => block.ptr().hash_as_b256(),
-            NearTrigger::Receipt(receipt) => receipt.block.ptr().hash_as_b256(),
+            NearTrigger::Block(block) => block.ptr().hash.as_b256(),
+            NearTrigger::Receipt(receipt) => receipt.block.ptr().hash.as_b256(),
         }
     }
 

graph/src/blockchain/types.rs

@@ -1,4 +1,4 @@
-use alloy::primitives::{B256, U256};
+use alloy::primitives::B256;
 use anyhow::anyhow;
 use diesel::deserialize::FromSql;
 use diesel::pg::Pg;
@@ -178,17 +178,6 @@ impl BlockPtr {
         self.number
     }
 
-    // // FIXME:
-    // //
-    // // workaround for arweave
-    // pub fn hash_as_h256(&self) -> H256 {
-    //     H256::from_slice(&self.hash_slice()[..32])
-    // }
-
-    pub fn hash_as_b256(&self) -> B256 {
-        B256::from_slice(&self.hash_slice()[..32])
-    }
-
     pub fn hash_slice(&self) -> &[u8] {
         self.hash.0.as_ref()
     }
@@ -268,8 +257,6 @@ impl From<(B256, u64)> for BlockPtr {
     }
 }
 
-
-
 impl From<(alloy::primitives::B256, i64)> for BlockPtr {
     fn from((hash, number): (alloy::primitives::B256, i64)) -> BlockPtr {
         let number = i32::try_from(number).unwrap();
@@ -341,7 +328,7 @@ impl IntoValue for BlockPtr {
 
 impl From<BlockPtr> for B256 {
     fn from(ptr: BlockPtr) -> Self {
-        ptr.hash_as_b256()
+        ptr.hash.as_b256()
     }
 }
 
@@ -425,22 +412,6 @@ impl ExtendedBlockPtr {
     pub fn block_number(&self) -> BlockNumber {
         self.number
     }
-
-    pub fn hash_as_b256(&self) -> B256 {
-        B256::from_slice(&self.hash_slice()[..32])
-    }
-
-    pub fn parent_hash_as_b256(&self) -> B256 {
-        B256::from_slice(&self.parent_hash_slice()[..32])
-    }
-
-    pub fn hash_slice(&self) -> &[u8] {
-        self.hash.0.as_ref()
-    }
-
-    pub fn parent_hash_slice(&self) -> &[u8] {
-        self.parent_hash.0.as_ref()
-    }
 }
 
 impl fmt::Display for ExtendedBlockPtr {

graph/src/components/ethereum/types.rs

@@ -42,8 +42,7 @@ impl BlockWrapper {
     }
 
     pub fn timestamp_u64(&self) -> u64 {
-        alloy_todo!()
-        // self.0.timestamp.as_u64()
+        self.0.header.timestamp
     }
 
     pub fn transactions(&self) -> &[Transaction] {

graph/src/data_source/common.rs

@@ -359,7 +359,8 @@ impl CallDecl {
                 Ok(DynSolValue::Int(x, x.bits() as usize))
             }
             (DynSolType::Int(_), Value::BigInt(i)) => {
-                let x = abi::I256::from_le_bytes(i.to_signed_u256().to_le_bytes::<{U256::BYTES}>());
+                let x =
+                    abi::I256::from_le_bytes(i.to_signed_u256().to_le_bytes::<{ U256::BYTES }>());
                 Ok(DynSolValue::Int(x, x.bits() as usize))
             }
             (DynSolType::Uint(_), Value::Int(i)) if *i >= 0 => {

graphql/src/store/resolver.rs

@@ -205,7 +205,7 @@ impl StoreResolver {
                 // locate_block indicates that we do not have a block hash
                 // by setting the hash to `zero`
                 // See 7a7b9708-adb7-4fc2-acec-88680cb07ec1
-                let hash_b256 = ptr.hash_as_b256();
+                let hash_b256 = ptr.hash.as_b256();
                 if hash_b256 == B256::ZERO {
                     None
                 } else {

store/postgres/src/chain_store.rs

@@ -2135,7 +2135,7 @@ impl ChainStoreTrait for ChainStore {
 
         let (missing, ptr) = {
             let chain_store = self.clone();
-            let genesis_block_ptr = self.genesis_block_ptr()?.hash_as_b256();
+            let genesis_block_ptr = self.genesis_block_ptr()?.hash.as_b256();
             self.pool
                 .with_conn(move |conn, _| {
                     let candidate = chain_store
@@ -2153,7 +2153,7 @@ impl ChainStoreTrait for ChainStore {
                             conn,
                             &chain_store.chain,
                             first_block as i64,
-                            ptr.hash_as_b256(),
+                            ptr.hash.as_b256(),
                             genesis_block_ptr,
                         )
                         .map_err(CancelableError::from)?

store/postgres/src/subgraph_store.rs

@@ -11,7 +11,6 @@ use std::{
 };
 use std::{iter::FromIterator, time::Duration};
 
-use graph::{futures03::future::join_all, prelude::alloy::primitives::Address};
 use graph::{
     cheap_clone::CheapClone,
     components::{
@@ -35,6 +34,7 @@ use graph::{
     url::Url,
     util::timed_cache::TimedCache,
 };
+use graph::{futures03::future::join_all, prelude::alloy::primitives::Address};
 
 use crate::{
     deployment::{OnSync, SubgraphHealth},