Skip to content

Commit 2374ddf

Browse files
committed
core, graph, store: Remove WritableStore.supports_proof_of_indexing
Subgraphs have in fact supported proof of indexing for almost 5 years since commit 40fd330 and we can therefore stop pretending that that method would ever return `false`
1 parent 1d550cb commit 2374ddf

File tree

6 files changed

+8
-57
lines changed

6 files changed

+8
-57
lines changed

core/src/subgraph/runner.rs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -367,14 +367,10 @@ where
367367
debug!(logger, "Start processing block";
368368
"triggers" => triggers.len());
369369

370-
let proof_of_indexing = if self.inputs.store.supports_proof_of_indexing().await? {
371-
Some(Arc::new(AtomicRefCell::new(ProofOfIndexing::new(
372-
block_ptr.number,
373-
self.inputs.poi_version,
374-
))))
375-
} else {
376-
None
377-
};
370+
let proof_of_indexing = Some(Arc::new(AtomicRefCell::new(ProofOfIndexing::new(
371+
block_ptr.number,
372+
self.inputs.poi_version,
373+
))));
378374

379375
// Causality region for onchain triggers.
380376
let causality_region = PoICausalityRegion::from_network(&self.inputs.network);
@@ -1318,14 +1314,10 @@ where
13181314
.deployment_head
13191315
.set(block_ptr.number as f64);
13201316

1321-
let proof_of_indexing = if self.inputs.store.supports_proof_of_indexing().await? {
1322-
Some(Arc::new(AtomicRefCell::new(ProofOfIndexing::new(
1323-
block_ptr.number,
1324-
self.inputs.poi_version,
1325-
))))
1326-
} else {
1327-
None
1328-
};
1317+
let proof_of_indexing = Some(Arc::new(AtomicRefCell::new(ProofOfIndexing::new(
1318+
block_ptr.number,
1319+
self.inputs.poi_version,
1320+
))));
13291321

13301322
// Causality region for onchain triggers.
13311323
let causality_region = PoICausalityRegion::from_network(&self.inputs.network);

graph/src/components/store/traits.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,6 @@ pub trait WritableStore: ReadStore + DeploymentCursorTracker {
365365
/// Set subgraph status to failed with the given error as the cause.
366366
async fn fail_subgraph(&self, error: SubgraphError) -> Result<(), StoreError>;
367367

368-
async fn supports_proof_of_indexing(&self) -> Result<bool, StoreError>;
369-
370368
/// Transact the entity changes from a single block atomically into the store, and update the
371369
/// subgraph block pointer to `block_ptr_to`, and update the firehose cursor to `firehose_cursor`
372370
///

store/postgres/src/deployment_store.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -916,20 +916,6 @@ impl DeploymentStore {
916916
}
917917
}
918918

919-
pub(crate) async fn supports_proof_of_indexing<'a>(
920-
&self,
921-
site: Arc<Site>,
922-
) -> Result<bool, StoreError> {
923-
let store = self.clone();
924-
self.with_conn(move |conn, cancel| {
925-
cancel.check_cancel()?;
926-
let layout = store.layout(conn, site)?;
927-
Ok(layout.supports_proof_of_indexing())
928-
})
929-
.await
930-
.map_err(Into::into)
931-
}
932-
933919
pub(crate) async fn get_proof_of_indexing(
934920
&self,
935921
site: Arc<Site>,
@@ -950,10 +936,6 @@ impl DeploymentStore {
950936

951937
let layout = store.layout(conn, site.cheap_clone())?;
952938

953-
if !layout.supports_proof_of_indexing() {
954-
return Ok(None);
955-
}
956-
957939
conn.transaction::<_, CancelableError<anyhow::Error>, _>(move |conn| {
958940
let mut block_ptr = block.cheap_clone();
959941
let latest_block_ptr =

store/postgres/src/relational.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,6 @@ impl Layout {
375375
}
376376
}
377377

378-
pub fn supports_proof_of_indexing(&self) -> bool {
379-
self.tables.contains_key(&self.input_schema.poi_type())
380-
}
381-
382378
pub fn create_relational_schema(
383379
conn: &mut PgConnection,
384380
site: Arc<Site>,

store/postgres/src/writable.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -279,15 +279,6 @@ impl SyncStore {
279279
.await
280280
}
281281

282-
async fn supports_proof_of_indexing(&self) -> Result<bool, StoreError> {
283-
retry::forever_async(&self.logger, "supports_proof_of_indexing", || async {
284-
self.writable
285-
.supports_proof_of_indexing(self.site.clone())
286-
.await
287-
})
288-
.await
289-
}
290-
291282
fn get(&self, key: &EntityKey, block: BlockNumber) -> Result<Option<Entity>, StoreError> {
292283
retry::forever(&self.logger, "get", || {
293284
self.writable.get(self.site.cheap_clone(), key, block)
@@ -1667,10 +1658,6 @@ impl WritableStoreTrait for WritableStore {
16671658
self.store.fail_subgraph(error).await
16681659
}
16691660

1670-
async fn supports_proof_of_indexing(&self) -> Result<bool, StoreError> {
1671-
self.store.supports_proof_of_indexing().await
1672-
}
1673-
16741661
async fn transact_block_operations(
16751662
&self,
16761663
block_ptr_to: BlockPtr,

store/test-store/tests/graph/entity_cache.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ impl WritableStore for MockStore {
121121
unimplemented!()
122122
}
123123

124-
async fn supports_proof_of_indexing(&self) -> Result<bool, StoreError> {
125-
unimplemented!()
126-
}
127-
128124
async fn transact_block_operations(
129125
&self,
130126
_: BlockPtr,

0 commit comments

Comments
 (0)