Browse Source

Compilation fix

master
Pratyush Mishra 4 years ago
parent
commit
d5e7d8bb36
4 changed files with 8 additions and 8 deletions
  1. +2
    -2
      crypto-primitives/src/commitment/pedersen/constraints.rs
  2. +2
    -2
      crypto-primitives/src/crh/bowe_hopwood/constraints.rs
  3. +2
    -2
      crypto-primitives/src/crh/pedersen/constraints.rs
  4. +2
    -2
      crypto-primitives/src/merkle_tree/constraints.rs

+ 2
- 2
crypto-primitives/src/commitment/pedersen/constraints.rs

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

+ 2
- 2
crypto-primitives/src/crh/bowe_hopwood/constraints.rs

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

+ 2
- 2
crypto-primitives/src/crh/pedersen/constraints.rs

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

+ 2
- 2
crypto-primitives/src/merkle_tree/constraints.rs

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

Loading…
Cancel
Save