rebase fixes for vec

Author: Zoran Cvetkov

chain/arweave/src/chain.rs

@@ -27,7 +27,7 @@ use graph::{
     prelude::{async_trait, o, BlockNumber, ChainStore, Error, Logger, LoggerFactory},
 };
 use prost::Message;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::sync::Arc;
 
 use crate::adapter::TriggerFilter;

chain/cosmos/src/chain.rs

@@ -4,7 +4,7 @@ use graph::components::adapter::ChainId;
 use graph::env::EnvVars;
 use graph::prelude::MetricsRegistry;
 use graph::substreams::Clock;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::convert::TryFrom;
 use std::sync::Arc;
 

chain/ethereum/src/chain.rs

@@ -37,7 +37,7 @@ use graph::{
     },
 };
 use prost::Message;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::iter::FromIterator;
 use std::sync::Arc;
 use std::time::Duration;

chain/near/src/chain.rs

@@ -32,7 +32,7 @@ use graph::{
     prelude::{async_trait, o, BlockNumber, ChainStore, Error, Logger, LoggerFactory},
 };
 use prost::Message;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::sync::Arc;
 
 use crate::adapter::TriggerFilter;

chain/starknet/src/chain.rs

@@ -30,10 +30,7 @@ use graph::{
     slog::o,
 };
 use prost::Message;
-use std::{
-    collections::{HashMap, HashSet},
-    sync::Arc,
-};
+use std::{collections::HashSet, sync::Arc};
 
 use crate::{
     adapter::TriggerFilter,

chain/substreams/src/block_stream.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use std::{collections::HashMap, sync::Arc};
+use std::sync::Arc;
 
 use graph::{
     blockchain::{

chain/substreams/src/chain.rs

@@ -23,7 +23,6 @@ use graph::{
     slog::Logger,
 };
 
-use std::collections::HashMap;
 use std::sync::Arc;
 
 // ParsedChanges are an internal representation of the equivalent operations defined on the

core/src/subgraph/inputs.rs

@@ -8,7 +8,7 @@ use graph::{
     data_source::DataSourceTemplate,
     prelude::BlockNumber,
 };
-use std::collections::{BTreeSet, HashMap};
+use std::collections::BTreeSet;
 use std::sync::Arc;
 
 pub struct IndexingInputs<C: Blockchain> {

core/src/subgraph/instance_manager.rs

@@ -3,7 +3,7 @@ use crate::subgraph::context::{IndexingContext, SubgraphKeepAlive};
 use crate::subgraph::inputs::IndexingInputs;
 use crate::subgraph::loader::load_dynamic_data_sources;
 use crate::subgraph::Decoder;
-use std::collections::{BTreeSet, HashMap};
+use std::collections::BTreeSet;
 
 use crate::subgraph::runner::SubgraphRunner;
 use graph::blockchain::block_stream::{BlockStreamMetrics, TriggersAdapterWrapper};

graph/src/blockchain/block_stream.rs

@@ -326,9 +326,13 @@ impl<C: Blockchain> TriggersAdapterWrapper<C> {
         adapter: Arc<dyn TriggersAdapter<C>>,
         source_subgraph_stores: Vec<Arc<dyn SourceableStore>>,
     ) -> Self {
+        let stores_map: HashMap<_, _> = source_subgraph_stores
+            .iter()
+            .map(|store| (store.input_schema().id().clone(), store.clone()))
+            .collect();
         Self {
             adapter,
-            source_subgraph_stores,
+            source_subgraph_stores: stores_map,
         }
     }