Skip to content

Simplify the SubgraphRunner a little #5953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 21, 2025
Merged

Simplify the SubgraphRunner a little #5953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c72998b
core: Extract transact_block_state into function
lutter Apr 17, 2025
6f558d6
core: block_state does not need to be mutable in transact_block_state
lutter Apr 17, 2025
c67f109
core: Make the handling of nonfatal errors a little less mindbending
lutter Apr 17, 2025
91bd6a7
core, graph: Specialize Cancelable a little to what we actually use
lutter Apr 17, 2025
c91a09e
core: Reduce noise by storing CancelHandle in Runner
lutter Apr 17, 2025
a8cacba
core, graph: Factor out the decision to cancel a buggy subgraph
lutter Apr 18, 2025
c319463
core: Factor refetching blocks into a method
lutter Apr 18, 2025
f4232ec
core: A little more noise reduction
lutter Apr 18, 2025
2f365c3
core: Reduce some noise around match_and_decode_many
lutter Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/src/subgraph/inputs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,12 @@ impl<C: Blockchain> IndexingInputs<C> {
instrument: *instrument,
}
}

pub fn errors_are_non_fatal(&self) -> bool {
self.features.contains(&SubgraphFeature::NonFatalErrors)
}

pub fn errors_are_fatal(&self) -> bool {
!self.features.contains(&SubgraphFeature::NonFatalErrors)
}
}
5 changes: 1 addition & 4 deletions core/src/subgraph/registrar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,7 @@ where
assignment_event_stream
.compat()
.map_err(SubgraphAssignmentProviderError::Unknown)
.map_err(CancelableError::Error)
.cancelable(&assignment_event_stream_cancel_handle, || {
Err(CancelableError::Cancel)
})
.cancelable(&assignment_event_stream_cancel_handle)
.compat()
.for_each(move |assignment_event| {
assert_eq!(assignment_event.node_id(), &node_id);
Expand Down
Loading
Loading