M crypto-primitives/src/commitment/pedersen/constraints.rs → crypto-primitives/src/commitment/pedersen/constraints.rs

@@ -215,7 +215,7 @@ crh::pedersen::PedersenWindow,
     };
     use r1cs_core::ConstraintSystem;
     use r1cs_std::{
-        edwards_on_bls12_381::JubJubGadget, prelude::*,
+        edwards_on_bls12_381::EdwardsGadget, prelude::*,
         test_constraint_system::TestConstraintSystem,
     };
 
@@ -236,7 +236,7 @@
         let rng = &mut test_rng();
 
         type TestCOMM = PedersenCommitment<JubJub, Window>;
-        type TestCOMMGadget = PedersenCommitmentGadget<JubJub, Fq, JubJubGadget>;
+        type TestCOMMGadget = PedersenCommitmentGadget<JubJub, Fq, EdwardsGadget>;
 
         let randomness = PedersenRandomness(Fr::rand(rng));
 

M crypto-primitives/src/crh/bowe_hopwood/constraints.rs → crypto-primitives/src/crh/bowe_hopwood/constraints.rs

@@ -150,12 +150,12 @@ test_rng, ProjectiveCurve,
     };
     use r1cs_core::ConstraintSystem;
     use r1cs_std::{
-        alloc::AllocGadget, edwards_on_bls12_381::JubJubGadget,
+        alloc::AllocGadget, edwards_on_bls12_381::EdwardsGadget,
         test_constraint_system::TestConstraintSystem, uint8::UInt8,
     };
 
     type TestCRH = BoweHopwoodPedersenCRH<JubJub, Window>;
-    type TestCRHGadget = BoweHopwoodPedersenCRHGadget<JubJub, Fr, JubJubGadget>;
+    type TestCRHGadget = BoweHopwoodPedersenCRHGadget<JubJub, Fr, EdwardsGadget>;
 
     #[derive(Clone, PartialEq, Eq, Hash)]
     pub(super) struct Window;

M crypto-primitives/src/crh/pedersen/constraints.rs → crypto-primitives/src/crh/pedersen/constraints.rs

@@ -138,13 +138,13 @@ test_rng, ProjectiveCurve,
     };
     use r1cs_core::ConstraintSystem;
     use r1cs_std::{
-        edwards_on_bls12_381::JubJubGadget, prelude::*,
+        edwards_on_bls12_381::EdwardsGadget, prelude::*,
         test_constraint_system::TestConstraintSystem,
     };
     use rand::Rng;
 
     type TestCRH = PedersenCRH<JubJub, Window>;
-    type TestCRHGadget = PedersenCRHGadget<JubJub, Fr, JubJubGadget>;
+    type TestCRHGadget = PedersenCRHGadget<JubJub, Fr, EdwardsGadget>;
 
     #[derive(Clone, PartialEq, Eq, Hash)]
     pub(super) struct Window;

M crypto-primitives/src/merkle_tree/constraints.rs → crypto-primitives/src/merkle_tree/constraints.rs

@@ -214,7 +214,7 @@ use rand_xorshift::XorShiftRng;
 
     use super::*;
     use r1cs_std::{
-        edwards_on_bls12_381::JubJubGadget, test_constraint_system::TestConstraintSystem,
+        edwards_on_bls12_381::EdwardsGadget, test_constraint_system::TestConstraintSystem,
     };
 
     #[derive(Clone)]
@@ -225,7 +225,7 @@ const NUM_WINDOWS: usize = 256;
     }
 
     type H = PedersenCRH<JubJub, Window4x256>;
-    type HG = PedersenCRHGadget<JubJub, Fq, JubJubGadget>;
+    type HG = PedersenCRHGadget<JubJub, Fq, EdwardsGadget>;
 
     struct JubJubMerkleTreeParams;