core,graph: Ethereum struct improvements, impl copy, make clone explicit

Author: fordN

core/src/subgraph/instance.rs

@@ -165,12 +165,11 @@ where
 
                 let transaction = block
                     .transaction_for_log(&log)
-                    .map(Arc::new)
+                    .map(|tx| Arc::new(tx.clone()))
                     .context("Found no transaction for event")?;
                 let matching_hosts = hosts.iter().filter(|host| host.matches_log(&log));
                 // Process the log in each host in the same order the corresponding data
                 // sources appear in the subgraph manifest
-                let transaction = Arc::new(transaction);
                 for host in matching_hosts {
                     state = host
                         .process_log(
@@ -189,8 +188,8 @@ where
 
                 let transaction = block
                     .transaction_for_call(&call)
+                    .map(|tx| Arc::new(tx.clone()))
                     .context("Found no transaction for call")?;
-                let transaction = Arc::new(transaction);
                 let matching_hosts = hosts.iter().filter(|host| host.matches_call(&call));
 
                 for host in matching_hosts {

graph/src/components/ethereum/adapter.rs

@@ -438,9 +438,9 @@ impl EthereumBlockFilter {
                     .mapping
                     .block_handlers
                     .iter()
-                    .map(|handler| &handler.input)
+                    .map(|handler| handler.input)
                     .max()
-                    .unwrap_or(&EthereumBlockHandlerData::Block)
+                    .unwrap_or(EthereumBlockHandlerData::Block)
                     .into();
 
                 filter_opt.extend(Self {

graph/src/components/ethereum/types.rs

@@ -200,6 +200,7 @@ pub enum EthereumBlockType {
 
     FullWithReceipts(EthereumBlock),
 }
+
 impl EthereumBlockType {
     pub fn light_block(&self) -> &LightEthereumBlock {
         match self {
@@ -217,26 +218,22 @@ impl EthereumBlockType {
         self.light_block().number.unwrap().as_u64()
     }
 
-    pub fn transaction_for_log(&self, log: &Log) -> Option<Transaction> {
-        log.transaction_hash
-            .and_then(|hash| {
-                self.light_block()
-                    .transactions
-                    .iter()
-                    .find(|tx| tx.hash == hash)
-            })
-            .cloned()
+    pub fn transaction_for_log(&self, log: &Log) -> Option<&Transaction> {
+        log.transaction_hash.and_then(|hash| {
+            self.light_block()
+                .transactions
+                .iter()
+                .find(|tx| tx.hash == hash)
+        })
     }
 
-    pub fn transaction_for_call(&self, call: &EthereumCall) -> Option<Transaction> {
-        call.transaction_hash
-            .and_then(|hash| {
-                self.light_block()
-                    .transactions
-                    .iter()
-                    .find(|tx| tx.hash == hash)
-            })
-            .cloned()
+    pub fn transaction_for_call(&self, call: &EthereumCall) -> Option<&Transaction> {
+        call.transaction_hash.and_then(|hash| {
+            self.light_block()
+                .transactions
+                .iter()
+                .find(|tx| tx.hash == hash)
+        })
     }
 }
 
@@ -259,8 +256,8 @@ impl Default for BlockType {
     }
 }
 
-impl<'a> From<&'a EthereumBlockHandlerData> for BlockType {
-    fn from(block: &'a EthereumBlockHandlerData) -> BlockType {
+impl From<EthereumBlockHandlerData> for BlockType {
+    fn from(block: EthereumBlockHandlerData) -> BlockType {
         match block {
             EthereumBlockHandlerData::Block => BlockType::Light,
             EthereumBlockHandlerData::FullBlock => BlockType::Full,
@@ -364,6 +361,7 @@ pub struct EthereumTransactionReceiptData {
     pub input: Bytes,
 }
 
+/// Ethereum block data with transactions and their receipts.
 pub struct FullEthereumBlockDataWithReceipts {
     pub hash: H256,
     pub parent_hash: H256,
@@ -443,18 +441,15 @@ impl<'a> TryFrom<&'a EthereumBlockType> for FullEthereumBlockDataWithReceipts {
     ) -> Result<FullEthereumBlockDataWithReceipts, Self::Error> {
         let fullblock = match block {
             EthereumBlockType::FullWithReceipts(full_block) => full_block,
-            EthereumBlockType::Full(_) => return Err(anyhow::anyhow!(
+            EthereumBlockType::Full(_) | EthereumBlockType::Light(_)  => return Err(anyhow::anyhow!(
                 "Failed to convert EthereumBlockType to FullEthereumBlockDataWithReceipts, requires an EthereumBlockType::FullWithReceipts()"
             )),
-            EthereumBlockType::Light(_) => return Err(anyhow::anyhow!(
-                "Failed to convert EthereumBlockType to FullEthereumBlockDataWithReceipts, requires an EthereumBlockType::FullWithReceipts()"
-            ))
         };
         Ok(fullblock.into())
     }
 }
 
-/// Ethereum block data.
+/// Ethereum block data with transactions.
 #[derive(Clone, Debug, Default)]
 pub struct FullEthereumBlockData {
     pub hash: H256,

graph/src/data/subgraph/schema.rs

@@ -1026,7 +1026,7 @@ impl WriteOperations for EthereumBlockHandlerEntity {
         if let Some(filter_id) = filter_id {
             entity.set("filter", filter_id);
         }
-        entity.set("input", String::from(self.input));
+        entity.set("input", self.input);
         ops.add(Self::TYPENAME, id.to_owned(), entity);
     }
 }
@@ -1110,7 +1110,7 @@ impl TryFromValue for EthereumBlockHandlerFilterEntity {
     }
 }
 
-#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord, Deserialize)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord, Deserialize)]
 pub enum EthereumBlockHandlerData {
     Block,
     FullBlock,
@@ -1149,9 +1149,9 @@ impl From<EthereumBlockHandlerData> for String {
     }
 }
 
-impl From<EthereumBlockHandlerData> for q::Value {
-    fn from(data: EthereumBlockHandlerData) -> q::Value {
-        q::Value::Enum(data.into())
+impl From<EthereumBlockHandlerData> for Value {
+    fn from(data: EthereumBlockHandlerData) -> Value {
+        Value::String(data.into())
     }
 }