ethereum: Remove option around block calls

Author: leoyvens

chain/ethereum/src/block_stream.rs

@@ -494,7 +494,7 @@ where
                         let block_with_calls = if !self.include_calls_in_blocks {
                             Box::new(future::ok(EthereumBlockWithCalls {
                                 ethereum_block: head_ancestor,
-                                calls: None,
+                                calls: vec![],
                             }))
                                 as Box<dyn Future<Item = _, Error = _> + Send>
                         } else {
@@ -508,7 +508,7 @@ where
                                     )
                                     .map(move |calls| EthereumBlockWithCalls {
                                         ethereum_block: head_ancestor,
-                                        calls: Some(calls),
+                                        calls,
                                     }),
                             )
                         };

graph/src/components/ethereum/adapter.rs

@@ -788,13 +788,12 @@ fn parse_call_triggers(
     call_filter: EthereumCallFilter,
     block: &EthereumBlockWithCalls,
 ) -> Vec<EthereumTrigger> {
-    block.calls.as_ref().map_or(vec![], |calls| {
-        calls
-            .iter()
-            .filter(move |call| call_filter.matches(call))
-            .map(move |call| EthereumTrigger::Call(call.clone()))
-            .collect()
-    })
+    block
+        .calls
+        .iter()
+        .filter(move |call| call_filter.matches(call))
+        .map(move |call| EthereumTrigger::Call(call.clone()))
+        .collect()
 }
 
 fn parse_block_triggers(
@@ -804,15 +803,14 @@ fn parse_block_triggers(
     let block_ptr = EthereumBlockPointer::from(&block.ethereum_block);
     let trigger_every_block = block_filter.trigger_every_block;
     let call_filter = EthereumCallFilter::from(block_filter);
-    let mut triggers = block.calls.as_ref().map_or(vec![], |calls| {
-        calls
-            .iter()
-            .filter(move |call| call_filter.matches(call))
-            .map(move |call| {
-                EthereumTrigger::Block(block_ptr, EthereumBlockTriggerType::WithCallTo(call.to))
-            })
-            .collect::<Vec<EthereumTrigger>>()
-    });
+    let mut triggers = block
+        .calls
+        .iter()
+        .filter(move |call| call_filter.matches(call))
+        .map(move |call| {
+            EthereumTrigger::Block(block_ptr, EthereumBlockTriggerType::WithCallTo(call.to))
+        })
+        .collect::<Vec<EthereumTrigger>>();
     if trigger_every_block {
         triggers.push(EthereumTrigger::Block(
             block_ptr,

graph/src/components/ethereum/types.rs

@@ -105,7 +105,7 @@ impl EthereumBlockWithTriggers {
 #[derive(Clone, Debug)]
 pub struct EthereumBlockWithCalls {
     pub ethereum_block: EthereumBlock,
-    pub calls: Option<Vec<EthereumCall>>,
+    pub calls: Vec<EthereumCall>,
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]