Skip to content
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: incorrect generation of Trace.java files #1524

Conversation

DavePearce
Copy link
Collaborator

There was an issue with the groovy task TraceFilesTask.groovy which was not accounting correctly for modules located in subdirectories. Specifically, it wasn't generating the correct Java package name.

This removes the need to specify `className=Trace` in the
`trace-files.gradle` build file, by allowing the default (which is
`Trace.java`) to be used when this is not specified.
@DavePearce DavePearce force-pushed the 1523-incorrect-generation-of-tracejava-for-instruction-decoder branch from 675e307 to 33c700e Compare November 20, 2024 08:20
@DavePearce DavePearce enabled auto-merge (squash) November 20, 2024 08:20
Copy link
Collaborator

@letypequividelespoubelles letypequividelespoubelles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@DavePearce DavePearce disabled auto-merge November 20, 2024 09:03
Copy link
Contributor

@gauravahuja gauravahuja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, just the one comment

"-o", "${project.projectDir}/src/main/java/net/consensys/linea/zktracer/module/${moduleDir.getOrElse(module.get())}"
]
if(className) {
if(project.hasProperty("className")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this would be better

Suggested change
if(project.hasProperty("className")) {
if(className.isPresent()) {

@OlivierBBB OlivierBBB enabled auto-merge (squash) November 20, 2024 16:57
@OlivierBBB OlivierBBB merged commit 691cf72 into arith-dev Nov 20, 2024
5 checks passed
@OlivierBBB OlivierBBB deleted the 1523-incorrect-generation-of-tracejava-for-instruction-decoder branch November 20, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect Generation of Trace.java for Instruction Decoder
4 participants