-
Notifications
You must be signed in to change notification settings - Fork 82
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.
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
fix(ci, core)!: ensure committed and code generated from protobuf spec match #1825
Conversation
9671baa
to
eacfdcc
Compare
eacfdcc
to
66704f2
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couple of minor comments, but non-blocking. LGTM otherwise.
786c9de
to
04d2617
Compare
04d2617
to
6d0092d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we move this out of the generated folder since it is a manually edited file? I recognize that this breaks our convention generally, but I think for generated files the convention should be a directory should be wholly generated files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving with note that I think we should migrate the generated mod.rs
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. 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