all: Remove unused node_id from a few places

Author: lutter

chain/ethereum/src/chain.rs

@@ -33,7 +33,7 @@ use graph::{
     firehose,
     prelude::{
         async_trait, o, serde_json as json, BlockNumber, ChainStore, EthereumBlockWithCalls,
-        Logger, LoggerFactory, NodeId,
+        Logger, LoggerFactory,
     },
 };
 use prost::Message;
@@ -214,7 +214,6 @@ impl BlockStreamBuilder<Chain> for EthereumStreamBuilder {
         Ok(Box::new(PollingBlockStream::new(
             chain_head_update_stream,
             Arc::new(adapter),
-            chain.node_id.clone(),
             deployment.hash,
             filter,
             start_blocks,
@@ -334,7 +333,6 @@ impl RuntimeAdapterBuilder for EthereumRuntimeAdapterBuilder {
 pub struct Chain {
     logger_factory: LoggerFactory,
     pub name: ChainName,
-    node_id: NodeId,
     registry: Arc<MetricsRegistry>,
     client: Arc<ChainClient<Self>>,
     chain_store: Arc<dyn ChainStore>,
@@ -361,7 +359,6 @@ impl Chain {
     pub fn new(
         logger_factory: LoggerFactory,
         name: ChainName,
-        node_id: NodeId,
         registry: Arc<MetricsRegistry>,
         chain_store: Arc<dyn ChainStore>,
         call_cache: Arc<dyn EthereumCallCache>,
@@ -379,7 +376,6 @@ impl Chain {
         Chain {
             logger_factory,
             name,
-            node_id,
             registry,
             client,
             chain_store,

chain/ethereum/src/polling_block_stream.rs

@@ -13,7 +13,7 @@ use graph::blockchain::block_stream::{
 };
 use graph::blockchain::{Block, BlockPtr, TriggerFilterWrapper};
 use graph::futures03::{stream::Stream, Future, FutureExt};
-use graph::prelude::{DeploymentHash, NodeId, BLOCK_NUMBER_MAX};
+use graph::prelude::{DeploymentHash, BLOCK_NUMBER_MAX};
 use graph::slog::{debug, info, trace, warn, Logger};
 
 use graph::components::store::BlockNumber;
@@ -74,7 +74,6 @@ enum ReconciliationStep {
 
 struct PollingBlockStreamContext {
     adapter: Arc<TriggersAdapterWrapper<Chain>>,
-    node_id: NodeId,
     subgraph_id: DeploymentHash,
     // This is not really a block number, but the (unsigned) difference
     // between two block numbers
@@ -96,7 +95,6 @@ impl Clone for PollingBlockStreamContext {
     fn clone(&self) -> Self {
         Self {
             adapter: self.adapter.clone(),
-            node_id: self.node_id.clone(),
             subgraph_id: self.subgraph_id.clone(),
             reorg_threshold: self.reorg_threshold,
             filter: self.filter.clone(),
@@ -133,7 +131,6 @@ impl PollingBlockStream {
     pub fn new(
         chain_head_update_stream: ChainHeadUpdateStream,
         adapter: Arc<TriggersAdapterWrapper<Chain>>,
-        node_id: NodeId,
         subgraph_id: DeploymentHash,
         filter: Arc<TriggerFilterWrapper<Chain>>,
         start_blocks: Vec<BlockNumber>,
@@ -151,7 +148,6 @@ impl PollingBlockStream {
             ctx: PollingBlockStreamContext {
                 current_block: start_block,
                 adapter,
-                node_id,
                 subgraph_id,
                 reorg_threshold,
                 logger,

node/src/chain.rs

@@ -17,7 +17,6 @@ use graph::blockchain::{
 use graph::cheap_clone::CheapClone;
 use graph::components::network_provider::ChainName;
 use graph::components::store::{BlockStore as _, ChainHeadStore};
-use graph::data::store::NodeId;
 use graph::endpoint::EndpointMetrics;
 use graph::env::{EnvVars, ENV_VARS};
 use graph::firehose::{FirehoseEndpoint, SubgraphLimit};
@@ -353,7 +352,6 @@ pub async fn create_ethereum_networks_for_chain(
 pub async fn networks_as_chains(
     config: &Arc<EnvVars>,
     blockchain_map: &mut BlockchainMap,
-    node_id: &NodeId,
     logger: &Logger,
     networks: &Networks,
     store: Arc<BlockStore>,
@@ -464,7 +462,6 @@ pub async fn networks_as_chains(
                 let chain = ethereum::Chain::new(
                     logger_factory.clone(),
                     chain_id.clone(),
-                    node_id.clone(),
                     metrics_registry.clone(),
                     chain_store.cheap_clone(),
                     call_cache,

node/src/main.rs

@@ -315,7 +315,6 @@ async fn main_inner() {
         let blockchain_map = network_adapters
             .blockchain_map(
                 &env_vars,
-                &node_id,
                 &logger,
                 block_store,
                 &logger_factory,

node/src/manager/commands/run.rs

@@ -129,7 +129,6 @@ pub async fn run(
         networks
             .blockchain_map(
                 &env_vars,
-                &node_id,
                 &logger,
                 block_store,
                 &logger_factory,

node/src/network_setup.rs

@@ -20,7 +20,7 @@ use graph::{
     log::factory::LoggerFactory,
     prelude::{
         anyhow::{anyhow, Result},
-        info, Logger, NodeId,
+        info, Logger,
     },
     slog::{o, warn, Discard},
 };
@@ -400,7 +400,6 @@ impl Networks {
     pub async fn blockchain_map(
         &self,
         config: &Arc<EnvVars>,
-        node_id: &NodeId,
         logger: &Logger,
         store: Arc<BlockStore>,
         logger_factory: &LoggerFactory,
@@ -412,7 +411,6 @@ impl Networks {
         networks_as_chains(
             config,
             &mut bm,
-            node_id,
             logger,
             self,
             store,

tests/src/fixture/ethereum.rs

@@ -40,7 +40,6 @@ pub async fn chain(
         mock_registry,
         chain_store,
         firehose_endpoints,
-        node_id,
     } = CommonChainConfig::new(test_name, stores).await;
 
     let client = Arc::new(ChainClient::<Chain>::new_firehose(firehose_endpoints));
@@ -53,7 +52,6 @@ pub async fn chain(
     let chain = Chain::new(
         logger_factory,
         stores.network_name.clone(),
-        node_id,
         mock_registry,
         chain_store.cheap_clone(),
         chain_store,

tests/src/fixture/mod.rs

@@ -87,7 +87,6 @@ struct CommonChainConfig {
     mock_registry: Arc<MetricsRegistry>,
     chain_store: Arc<ChainStore>,
     firehose_endpoints: FirehoseEndpoints,
-    node_id: NodeId,
 }
 
 impl CommonChainConfig {
@@ -96,7 +95,6 @@ impl CommonChainConfig {
         let mock_registry = Arc::new(MetricsRegistry::mock());
         let logger_factory = LoggerFactory::new(logger.cheap_clone(), None, mock_registry.clone());
         let chain_store = stores.chain_store.cheap_clone();
-        let node_id = NodeId::new(NODE_ID).unwrap();
 
         let firehose_endpoints =
             FirehoseEndpoints::for_testing(vec![Arc::new(FirehoseEndpoint::new(
@@ -116,7 +114,6 @@ impl CommonChainConfig {
             mock_registry,
             chain_store,
             firehose_endpoints,
-            node_id,
         }
     }
 }