datasource/ethereum: Remove `_opt` suffix from filter variables
@@ -61,9 +61,9 @@ enum ReconciliationStep {
/// Move forwards, processing one or more blocks.
ProcessDescendantBlocks {
from: EthereumBlockPointer,
- log_filter_opt: Option<EthereumLogFilter>,
- call_filter_opt: Option<EthereumCallFilter>,
- block_filter_opt: Option<EthereumBlockFilter>,
+ log_filter: Option<EthereumLogFilter>,
+ call_filter: Option<EthereumCallFilter>,
+ block_filter: Option<EthereumBlockFilter>,
descendant_blocks: Box<Stream<Item = EthereumBlockWithCalls, Error = Error> + Send>,
},
@@ -405,9 +405,9 @@ where
// Proceed to those blocks
ReconciliationStep::ProcessDescendantBlocks {
from: subgraph_ptr,
- log_filter_opt: log_filter.clone(),
- call_filter_opt: call_filter.clone(),
- block_filter_opt: block_filter.clone(),
+ log_filter: log_filter.clone(),
+ call_filter: call_filter.clone(),
+ block_filter: block_filter.clone(),
descendant_blocks: Box::new(ctx.load_blocks(descendant_hashes)),
}
))
@@ -492,9 +492,9 @@ where
);
Box::new(future::ok(ReconciliationStep::ProcessDescendantBlocks {
from: subgraph_ptr,
- log_filter_opt: log_filter.clone(),
- call_filter_opt: call_filter.clone(),
- block_filter_opt: block_filter.clone(),
+ log_filter: log_filter.clone(),
+ call_filter: call_filter.clone(),
+ block_filter: block_filter.clone(),
descendant_blocks: Box::new(stream::futures_ordered(vec![
block_future,
])),
@@ -573,15 +573,15 @@ where
}
ReconciliationStep::ProcessDescendantBlocks {
from,
- log_filter_opt,
- call_filter_opt,
- block_filter_opt,
+ log_filter,
+ call_filter,
+ block_filter,
descendant_blocks,
} => {
let mut subgraph_ptr = from;
- let log_filter_opt = log_filter_opt.clone();
- let call_filter_opt = call_filter_opt.clone();
- let block_filter_opt = block_filter_opt.clone();
+ let log_filter = log_filter.clone();
+ let call_filter = call_filter.clone();
+ let block_filter = block_filter.clone();
// Advance the subgraph ptr to each of the specified descendants and yield each
// block with relevant events.
@@ -621,9 +621,9 @@ where
})
.and_then(move |descendant_block| {
let triggers = match parse_triggers(
- log_filter_opt.clone(),
- call_filter_opt.clone(),
- block_filter_opt.clone(),
+ log_filter.clone(),
+ call_filter.clone(),
+ block_filter.clone(),
&descendant_block,
) {
Ok(triggers) => triggers,
