-
Notifications
You must be signed in to change notification settings - Fork 23
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
Naming and its align #66
Conversation
[Discussion] results are incorporated. Naming groomed repository wide. \ Fun fact: I already was confused by that "hash2" naming, lol. Note that `fn verify_signals` barely [benefit] from renaming at all currently. [Discussion]: 251fba6#commitcomment-130400727 [benefit]: #61
@Divide-By-0 I suggest merging commit without squashing -- could help for further debugging a bit if anything. |
There shouldn't be both package lock and yarn lock :) |
Hey I'd love to merge but there are some conflicts, do you mind resolving those first? |
Actually I did. Twice. X)) To absorb #48 . So there was "22_resolveConflict" branch (now deleted), then this one with trailing "_", and it had the nice green button to choose between squash & merge commit. Then some of the following bump commits reintroduced the conflict. =(( Long story short: the problem I see here is that these lock files have substantial size and it's better to minimize the back and forth with them (last time I saw was via deprecated npm cache clean force instead of current I'm not that good in Git to touch the repo with
|
Yikes, good feedback. I'm open to any structural changes you'd recommend! For one we should just gitignore package lock, overwriting yarn lock seems alright, I agree it's not an ideal practice. I don't really have any ideas here; maybe we can edit our dependabot settings somehow, or cut these lock files entirely and make versioning in package json more explicit?? Idk, I'm OK with whatever you choose. |
Yeah, sounds like a good idea to So I currently stick to the path where I revert commits starting from https://github.com/plume-sig/zk-nullifier-sig/compare/f4b53bc1835aaccd114f9ab070b3cac381fabf04..main, and then merge this PR. This course let isolate the bloat in that one reverse commit so that someone fluent in Git could remove dead weight with Will tackle this now or then. |
* Delete javascript/yarn.lock * Delete javascript/package-lock.json
See #64 for details. This additional PR created for merging conflict resolution.