oops merge

README.md

@@ -53,34 +53,5 @@ node $SJS_BIN groth16 setup ./build/gcm_siv_dec_2_keys_test.r1cs ./build/powersO
 # test circuit
 circom --wasm --sym --r1cs --output ./build ./circuits/aes/tiny.circom
 
-<<<<<<< HEAD
-*install snarkjs*
-
-`npm install -g snarkjs@latest`
-
-*compile circuits*
-
-`mkdir build`
-
-`circom --wasm --sym --r1cs --output ./build ./circuits/gcm_siv_dec_2_keys_test.circom`
-
-*generate trusted setup*
-NOTE: This is currently unused because the rust zkey parser is horrible. 
-
-`cd build && curl "https://hermez.s3-eu-west-1.amazonaws.com/powersOfTau28_hez_final_10.ptau" --output './build/powersOfTau28_hez_final_10.ptau' && cd ..`
-
-`cd build && curl "https://hermez.s3-eu-west-1.amazonaws.com/powersOfTau28_hez_final_19.ptau" --output './build/powersOfTau28_hez_final_19.ptau' && cd ..`
-
-`SJS_BIN=$(dirname $(npm list -g --depth=0 | head -n 1)); SJS_BIN+="/bin/snarkjs"`
-
-`node $SJS_BIN groth16 setup ./build/gcm_siv_dec_2_keys_test.r1cs ./build/powersOfTau28_hez_final_19.ptau ./build/test_0000.zkey`
-
-*test circuit*
-
-`circom --wasm --sym --r1cs --output ./build ./circuits/tiny.circom`
-
-`snarkjs zkey new ./build/tiny.r1cs ./build/powersOfTau28_hez_final_10.ptau ./build/tiny.zkey`
-=======
 snarkjs zkey new ./build/tiny.r1cs ./build/powersOfTau28_hez_final_10.ptau ./build/tiny.zkey
 ```
->>>>>>> main