fix(ci, core)!: ensure committed and code generated from protobuf spec match #1825
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.
Summary
Deletes and regenerates all code in
astria-core/src/generated
. Fixes bad imports by nesting generated Astria APIs under a newastria
module. Fixes badly named modules.Background
#1236 noticed that some protobuf files were skipped during code generation because of a
tonic_build::Builder::extern_path
statement that. This showed up again when reworking the protobuf compilation tool to first clear the target directory for storing the generated rust files, where now aninclude!
statement inastria_core::generated
failed because the file was not in fact generated. This was not detected because the file was still committed to the repository at an earlier point.#1707 then added new generated code under a wrongly named
optimistic_block
module, which should have been namedoptimistic
to be in line with its protobuf package counterpart.The present change is primarily to the
tools/protobuf-compiler
binary, which first purges the output directory (minus the handwrittenmod.rs
) before generating new code.Changes
tools/protobuf-compiler
to clearastria-core/src/generated
prior to repopulating it fromproto/
sequencerblock::optimisticblock
sequencerblock::optimistic
astria_core::generated
toastria_core::generated::astria
.Testing
This is just code organization. Import paths were updated, code still compiles and tests pass.
Changelogs
Changelogs updated.
Breaking Changelist
astria_core
that now need to import many items fromastria_core::generated::astria
that were directly underastria_core::generated
before.Override Freeze
This code touches services by changing their imports (
astria_core::generated -> astria_core::generated::astria
) but does change any implementation details.Related Issues
Fixes and amends #1707.
Supersedes #1824
Closes #1823