graph: Remove duplicate struct BlockHandlerData

EthereumBlockHandlerData has the same variants, no need for both.

Author: fordN

graph/src/components/ethereum/adapter.rs

@@ -14,7 +14,6 @@ use web3::types::*;
 
 use super::types::*;
 use crate::components::metrics::{CounterVec, GaugeVec, HistogramVec};
-use crate::data::subgraph::BlockHandlerData;
 use crate::prelude::*;
 
 pub type EventSignature = H256;

graph/src/components/ethereum/types.rs

@@ -7,7 +7,9 @@ use std::convert::TryFrom;
 use std::fmt;
 use web3::types::*;
 
-use crate::prelude::{EntityKey, SubgraphDeploymentId, ToEntityKey};
+use crate::prelude::{
+    anyhow, EntityKey, EthereumBlockHandlerData, SubgraphDeploymentId, ToEntityKey,
+};
 
 pub type LightEthereumBlock = Block<Transaction>;
 
@@ -257,6 +259,22 @@ impl Default for BlockType {
     }
 }
 
+impl<'a> From<&'a EthereumBlockHandlerData> for BlockType {
+    fn from(block: &'a EthereumBlockHandlerData) -> BlockType {
+        match block {
+            EthereumBlockHandlerData::Block => BlockType::Light,
+            EthereumBlockHandlerData::FullBlock => BlockType::Full,
+            EthereumBlockHandlerData::FullBlockWithReceipts => BlockType::FullWithReceipts,
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct EthereumBlockTrigger {
+    pub block_type: BlockType,
+    pub trigger_type: EthereumBlockTriggerType,
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum EthereumBlockTriggerType {
     Every,

graph/src/data/subgraph/mod.rs

@@ -515,26 +515,7 @@ impl UnresolvedMappingABI {
 pub struct MappingBlockHandler {
     pub handler: String,
     pub filter: Option<BlockHandlerFilter>,
-    pub input: BlockHandlerData,
-}
-
-#[derive(Clone, Debug, Hash, Eq, PartialEq, Deserialize)]
-pub enum BlockHandlerData {
-    Block,
-    FullBlock,
-    FullBlockWithReceipts,
-}
-
-impl From<EthereumBlockHandlerData> for BlockHandlerData {
-    fn from(data: EthereumBlockHandlerData) -> Self {
-        match data {
-            EthereumBlockHandlerData::FullBlockWithReceipts => {
-                BlockHandlerData::FullBlockWithReceipts
-            }
-            EthereumBlockHandlerData::FullBlock => BlockHandlerData::FullBlock,
-            EthereumBlockHandlerData::Block => BlockHandlerData::Block,
-        }
-    }
+    pub input: EthereumBlockHandlerData,
 }
 
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Deserialize)]
@@ -550,7 +531,7 @@ impl From<EthereumBlockHandlerEntity> for MappingBlockHandler {
         Self {
             handler: entity.handler,
             filter: None,
-            input: BlockHandlerData::from(entity.input),
+            input: entity.input,
         }
     }
 }

graph/src/data/subgraph/schema.rs

@@ -1149,15 +1149,6 @@ impl From<EthereumBlockHandlerData> for String {
     }
 }
 
-impl From<super::BlockHandlerData> for EthereumBlockHandlerData {
-    fn from(data: BlockHandlerData) -> Self {
-        match data {
-            BlockHandlerData::FullBlock => EthereumBlockHandlerData::FullBlock,
-            _ => EthereumBlockHandlerData::Block,
-        }
-    }
-}
-
 impl From<EthereumBlockHandlerData> for q::Value {
     fn from(data: EthereumBlockHandlerData) -> q::Value {
         q::Value::Enum(data.into())

graph/src/lib.rs

@@ -127,9 +127,11 @@ pub mod prelude {
         AssignmentEvent, Attribute, Entity, NodeId, SubgraphEntityPair, SubgraphVersionSummary,
         ToEntityId, ToEntityKey, TryIntoEntity, Value, ValueType,
     };
-    pub use crate::data::subgraph::schema::{SubgraphDeploymentEntity, TypedEntity};
+    pub use crate::data::subgraph::schema::{
+        EthereumBlockHandlerData, SubgraphDeploymentEntity, TypedEntity,
+    };
     pub use crate::data::subgraph::{
-        BlockHandlerData, BlockHandlerFilter, CreateSubgraphResult, DataSource, DataSourceContext,
+        BlockHandlerFilter, CreateSubgraphResult, DataSource, DataSourceContext,
         DataSourceTemplate, Link, MappingABI, MappingBlockHandler, MappingCallHandler,
         MappingEventHandler, SubgraphAssignmentProviderError, SubgraphAssignmentProviderEvent,
         SubgraphDeploymentId, SubgraphManifest, SubgraphManifestResolveError,