Fix offchain created from offchain #5051
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
leoyvens
force-pushed
the
leo/fix-offchain-created-from-offchain
branch
3 times, most recently
from
7ec4598
to
abf9f26
Compare
leoyvens
force-pushed
the
leo/fix-offchain-created-from-offchain
branch
from
abf9f26
to
d457b3b
Compare
lutter
approved these changes
Dec 18, 2023
tests/tests/runner_tests.rs
Outdated
| Ok(()) | ||
| } | ||
|
|
||
| async fn data_source_long_revert() -> anyhow::Result<()> { |
There was a problem hiding this comment.
Not a huge deal, but committing a failing test before the fix will make bisecting through this change harder
There was a problem hiding this comment.
Yhea I'll squash merge
| let host = this.new_host(logger.cheap_clone(), ds, module_bytes)?; | ||
| this.hosts.push(Arc::new(host)); | ||
| let Some(host) = this.new_host(logger.cheap_clone(), ds)? else { continue }; | ||
| this.hosts.push(host); |
There was a problem hiding this comment.
I think this would be cleaner as a if let Some(..) so we can avoid the continue
There was a problem hiding this comment.
This code changes in a further commit.
| Some(host) | ||
| }) | ||
| // Check for duplicates and add the host. | ||
| match is_onchain { |
There was a problem hiding this comment.
Wouldn't a simple if be clearer here?
| .last() | ||
| .and_then(|h| h.creation_block_number()) | ||
| <= host.data_source().creation_block() | ||
| ); |
There was a problem hiding this comment.
I am always a bit queasy with asserts since it's not that easy to spot panics in the logs; could we return an error here? That way, the subgraph will fail and the failure can tell use what exactly is wrong.
The hosts Vec expected the hosts to be pushed in ascending order of block number. Creating a file ds B within another file ds A violated that assumption, because B will have the same creation block as A. This is by design, so the cleanest way to fix this seemed to be separating the data structures for onchain and offchain hosts. Offchain data sources do not need to maintain insertion order, as their processing order ultimately does not impact determinism because they each have their own causality region. If in the future we introduce a feature that allows two different offchain data sources to have the same causality region, we maybe need to revisit this.
leoyvens
force-pushed
the
leo/fix-offchain-created-from-offchain
branch
from
d457b3b
to
1cf8d66
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is blocking the update to the network subgraph, which now uses file data sources within file data sources.
This is more easily reviewed commit by commit. The first four commits are strictly refactors.