Skip to content

Commit c8767c9

Browse files
committed
chain, graph: Move PollingBlockStream to ethereum crate
It's the only chain impl that actually uses it
1 parent 11daed0 commit c8767c9

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

chain/ethereum/src/chain.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use graph::{
2525
FirehoseMapper as FirehoseMapperTrait, TriggersAdapter as TriggersAdapterTrait,
2626
},
2727
firehose_block_stream::FirehoseBlockStream,
28-
polling_block_stream::PollingBlockStream,
2928
Block, BlockPtr, Blockchain, ChainHeadUpdateListener, IngestorError,
3029
RuntimeAdapter as RuntimeAdapterTrait, TriggerFilter as _,
3130
},
@@ -49,6 +48,7 @@ use crate::data_source::DataSourceTemplate;
4948
use crate::data_source::UnresolvedDataSourceTemplate;
5049
use crate::ingestor::PollingBlockIngestor;
5150
use crate::network::EthereumNetworkAdapters;
51+
use crate::polling_block_stream::PollingBlockStream;
5252
use crate::runtime::runtime_adapter::eth_call_gas;
5353
use crate::{
5454
adapter::EthereumAdapter as _,

chain/ethereum/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ mod data_source;
66
mod env;
77
mod ethereum_adapter;
88
mod ingestor;
9+
mod polling_block_stream;
910
pub mod runtime;
1011
mod transport;
1112

graph/src/blockchain/polling_block_stream.rs renamed to chain/ethereum/src/polling_block_stream.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
use anyhow::Error;
2-
use futures03::{stream::Stream, Future, FutureExt};
1+
use anyhow::{anyhow, Error};
2+
use graph::tokio;
33
use std::cmp;
44
use std::collections::VecDeque;
55
use std::pin::Pin;
66
use std::sync::Arc;
77
use std::task::{Context, Poll};
88
use std::time::Duration;
99

10-
use super::block_stream::{
10+
use graph::blockchain::block_stream::{
1111
BlockStream, BlockStreamError, BlockStreamEvent, BlockWithTriggers, ChainHeadUpdateStream,
1212
FirehoseCursor, TriggersAdapterWrapper, BUFFERED_BLOCK_STREAM_SIZE,
1313
};
14-
use super::{Block, BlockPtr, Blockchain, TriggerFilterWrapper};
14+
use graph::blockchain::{Block, BlockPtr, Blockchain, TriggerFilterWrapper};
15+
use graph::futures03::{stream::Stream, Future, FutureExt};
16+
use graph::prelude::{ChainStore, CheapClone, DeploymentHash, NodeId, BLOCK_NUMBER_MAX};
17+
use graph::slog::{debug, info, trace, warn, Logger};
1518

16-
use crate::components::store::BlockNumber;
17-
use crate::data::subgraph::UnifiedMappingApiVersion;
18-
use crate::prelude::*;
19+
use graph::components::store::BlockNumber;
20+
use graph::data::subgraph::UnifiedMappingApiVersion;
1921

2022
// A high number here forces a slow start.
2123
const STARTING_PREVIOUS_TRIGGERS_PER_BLOCK: f64 = 1_000_000.0;

graph/src/blockchain/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub mod firehose_block_ingestor;
1010
pub mod firehose_block_stream;
1111
pub mod mock;
1212
mod noop_runtime_adapter;
13-
pub mod polling_block_stream;
1413
pub mod substreams_block_stream;
1514
mod types;
1615

0 commit comments

Comments
 (0)