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

Blake cleanup #87

Merged
merged 10 commits into from
Oct 21, 2019
Merged

Blake cleanup #87

merged 10 commits into from
Oct 21, 2019

Conversation

rrtoledo
Copy link
Contributor

Cleaning up comments and ifndef in blake (as well as some file names) for consistency.

I had to add "_type" for the ifndef of the types/* files as types/note.hpp would have had the same flag (with the circuit's one) (and then for consistency).

src/circuits/blake2s/g_primitive.hpp Outdated Show resolved Hide resolved
src/circuits/circuits-util.cpp Outdated Show resolved Hide resolved
src/types/note.hpp Outdated Show resolved Hide resolved
src/util_api.cpp Outdated Show resolved Hide resolved
@AntoineRondelet
Copy link
Contributor

AntoineRondelet commented Oct 17, 2019

I had to add "_type" for the ifndef of the types/* files as types/note.hpp would have had the same flag (with the circuit's one) (and then for consistency).

So then, let's follow the same approach for the files with name collision and have something like __ZETH_CIRCUITS_NOTES__

@rrtoledo
Copy link
Contributor Author

@AntoineRondelet The changes done so far are mostly about comments, ifndef, some renaming and a few includes that I removed or replaced (snark_alias in some circuits, and mimc_mp in note.hpp).

Please have a look when you can.

pyClient/zethGRPC.py Outdated Show resolved Hide resolved
src/circuits/circuits-util.tcc Show resolved Hide resolved
@AntoineRondelet AntoineRondelet merged commit 2b25f34 into blake2s Oct 21, 2019
@rrtoledo rrtoledo deleted the blake_cleanup branch October 25, 2019 09:59
AntoineRondelet added a commit that referenced this pull request May 6, 2020
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.

None yet

2 participants