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

ZIR-345: Delete unused keccak circuit; rename keccak2 to keccak #191

Merged
merged 1 commit into from
Feb 20, 2025

Conversation

jacobdweightman
Copy link
Contributor

We currently have two versions of the keccak: the "narrow" version, keccak, and the "wide" version, keccak2. The latter is the one we use in production, while the former is currently unused. Having these two separate implementations side-by-side has caused confusion for a number of external parties, so it seems best to clean this up. The source code for "narrow" keccak will be preserved in the git history, so if we decide we want it down the road we still have it.

@github-actions github-actions bot changed the title Delete unused keccak circuit; rename keccak2 to keccak ZIR-345: Delete unused keccak circuit; rename keccak2 to keccak Feb 20, 2025
@@ -1,48 +1,95 @@
load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
Copy link
Contributor

Choose a reason for hiding this comment

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

the extensive changes in this diff confused me for quite a while until I realized git has simply replaced zirgen/circuit/keccak/BUILD.bazel with zirgen/circuit/keccak2/BUILD.bazel, and nothing has actually changed! Funny

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, the diff is annoying. I thought about splitting it up into multiple commits, but it'll get squashed down anyway. Complete summary of my process:

  • Ran tests on unaltered repo, verified they passed
  • Deleted the /zirgen/circuit/keccak directory
  • Reran tests, noted a bazel issue with the //zirgen/circuit:circuit target. Fixed.
  • Observed the tests passed again
  • Renamed the /zirgen/circuit/keccak2 directory to keccak
  • Ran "find and replace" keccak2 -> keccak
  • Observed the tests passed again, and it's done!

@jacobdweightman jacobdweightman enabled auto-merge (squash) February 20, 2025 17:42
@jacobdweightman jacobdweightman merged commit 9a6294a into main Feb 20, 2025
10 checks passed
@jacobdweightman jacobdweightman deleted the jacob/keccak-cleanup branch February 20, 2025 17:46
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.

2 participants