Skip to content

Commit 23e14a7

Browse files
committed
chain,graph : use chain_head_ptr method from adapter
1 parent 7383b11 commit 23e14a7

File tree

10 files changed

+42
-25
lines changed

10 files changed

+42
-25
lines changed

chain/arweave/src/chain.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
203203
panic!("Should never be called since not used by FirehoseBlockStream")
204204
}
205205

206+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
207+
unimplemented!()
208+
}
209+
206210
async fn triggers_in_block(
207211
&self,
208212
logger: &Logger,

chain/cosmos/src/chain.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
197197
panic!("Should never be called since not used by FirehoseBlockStream")
198198
}
199199

200+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
201+
unimplemented!()
202+
}
203+
200204
async fn scan_triggers(
201205
&self,
202206
_from: BlockNumber,

chain/ethereum/src/chain.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,11 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
776776
.await
777777
}
778778

779+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
780+
let chain_store = self.chain_store.clone();
781+
chain_store.chain_head_ptr().await
782+
}
783+
779784
async fn triggers_in_block(
780785
&self,
781786
logger: &Logger,

chain/near/src/chain.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,10 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
336336
panic!("Should never be called since not used by FirehoseBlockStream")
337337
}
338338

339+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
340+
unimplemented!()
341+
}
342+
339343
async fn triggers_in_block(
340344
&self,
341345
logger: &Logger,

chain/starknet/src/chain.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,10 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
383383
panic!("Should never be called since FirehoseBlockStream cannot resolve it")
384384
}
385385

386+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
387+
unimplemented!()
388+
}
389+
386390
// Returns a sequence of blocks in increasing order of block number.
387391
// Each block will include all of its triggers that match the given `filter`.
388392
// The sequence may omit blocks that contain no triggers,

chain/substreams/src/trigger.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ impl blockchain::TriggersAdapter<Chain> for TriggersAdapter {
137137
unimplemented!()
138138
}
139139

140+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
141+
unimplemented!()
142+
}
143+
140144
async fn scan_triggers(
141145
&self,
142146
_from: BlockNumber,

graph/src/blockchain/block_stream.rs

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -353,31 +353,11 @@ impl<C: Blockchain> TriggersAdapter<C> for TriggersAdapterWrapper<C> {
353353
async fn parent_ptr(&self, block: &BlockPtr) -> Result<Option<BlockPtr>, Error> {
354354
self.adapter.parent_ptr(block).await
355355
}
356-
}
357356

358-
// fn create_mock_trigger<C: Blockchain>() -> Trigger<C> {
359-
// let entity = create_mock_entity();
360-
// Trigger::Subgraph(subgraph::TriggerData {
361-
// source: DeploymentHash::new("test").unwrap(),
362-
// entity,
363-
// entity_type: "User".to_string(),
364-
// })
365-
// }
366-
367-
// fn create_mock_entity() -> Entity {
368-
// let schema = InputSchema::parse_latest(
369-
// "type User @entity { id: String!, val: String! }",
370-
// DeploymentHash::new("test").unwrap(),
371-
// )
372-
// .unwrap();
373-
374-
// schema
375-
// .make_entity(vec![
376-
// ("id".into(), Value::String("id".to_owned())),
377-
// ("val".into(), Value::String("content".to_owned())),
378-
// ])
379-
// .unwrap()
380-
// }
357+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
358+
self.adapter.chain_head_ptr().await
359+
}
360+
}
381361

382362
#[async_trait]
383363
pub trait TriggersAdapter<C: Blockchain>: Send + Sync {
@@ -419,6 +399,9 @@ pub trait TriggersAdapter<C: Blockchain>: Send + Sync {
419399

420400
/// Get pointer to parent of `block`. This is called when reverting `block`.
421401
async fn parent_ptr(&self, block: &BlockPtr) -> Result<Option<BlockPtr>, Error>;
402+
403+
/// Get pointer to parent of `block`. This is called when reverting `block`.
404+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error>;
422405
}
423406

424407
#[async_trait]

graph/src/blockchain/mock.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,11 @@ impl TriggersAdapter<MockBlockchain> for MockTriggersAdapter {
228228
todo!()
229229
}
230230

231+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
232+
unimplemented!()
233+
}
234+
235+
231236
async fn scan_triggers(
232237
&self,
233238
from: crate::components::store::BlockNumber,

graph/src/blockchain/polling_block_stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ where
218218
let max_block_range_size = self.max_block_range_size;
219219

220220
// Get pointers from database for comparison
221-
let head_ptr_opt = ctx.chain_store.chain_head_ptr().await?;
221+
let head_ptr_opt = ctx.adapter.chain_head_ptr().await?;
222222
let subgraph_ptr = self.current_block.clone();
223223

224224
// If chain head ptr is not set yet

tests/src/fixture/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,6 +1002,10 @@ impl<C: Blockchain> TriggersAdapter<C> for MockTriggersAdapter<C> {
10021002
todo!()
10031003
}
10041004

1005+
async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
1006+
todo!()
1007+
}
1008+
10051009
async fn scan_triggers(
10061010
&self,
10071011
_from: BlockNumber,

0 commit comments

Comments
 (0)