From c03e1045f2c560dbfa3b03c9e0d6e5e0e181cd6f Mon Sep 17 00:00:00 2001
From: howardwu <howardwu@berkeley.edu>
Date: Thu, 4 Mar 2021 10:57:20 -0800
Subject: [PATCH] Update gadgets traits

---
 compiler/src/prelude/blake2s.rs                   | 2 +-
 compiler/src/value/field/field_type.rs            | 6 +++---
 compiler/src/value/group/targets/edwards_bls12.rs | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/src/prelude/blake2s.rs b/compiler/src/prelude/blake2s.rs
index 6a89d801f2..0ed7ff9945 100644
--- a/compiler/src/prelude/blake2s.rs
+++ b/compiler/src/prelude/blake2s.rs
@@ -23,9 +23,9 @@ use leo_asg::Function;
 use leo_asg::Span;
 use snarkvm_fields::PrimeField;
 use snarkvm_gadgets::algorithms::prf::Blake2sGadget;
+use snarkvm_gadgets::algorithms::PRFGadget;
 use snarkvm_gadgets::traits::utilities::uint::UInt8;
 use snarkvm_gadgets::traits::utilities::ToBytesGadget;
-use snarkvm_models::gadgets::algorithms::PRFGadget;
 use snarkvm_r1cs::ConstraintSystem;
 
 pub struct Blake2s;
diff --git a/compiler/src/value/field/field_type.rs b/compiler/src/value/field/field_type.rs
index 6111ca27a2..3423ba1634 100644
--- a/compiler/src/value/field/field_type.rs
+++ b/compiler/src/value/field/field_type.rs
@@ -21,6 +21,9 @@ use crate::number_string_typing;
 use leo_ast::Span;
 
 use snarkvm_fields::PrimeField;
+use snarkvm_gadgets::curves::AllocatedFp;
+use snarkvm_gadgets::curves::FieldGadget;
+use snarkvm_gadgets::curves::FpGadget;
 use snarkvm_gadgets::traits::utilities::alloc::AllocGadget;
 use snarkvm_gadgets::traits::utilities::boolean::Boolean;
 use snarkvm_gadgets::traits::utilities::eq::ConditionalEqGadget;
@@ -30,9 +33,6 @@ use snarkvm_gadgets::traits::utilities::select::CondSelectGadget;
 use snarkvm_gadgets::traits::utilities::uint::UInt8;
 use snarkvm_gadgets::traits::utilities::ToBitsGadget;
 use snarkvm_gadgets::traits::utilities::ToBytesGadget;
-use snarkvm_models::gadgets::curves::AllocatedFp;
-use snarkvm_models::gadgets::curves::FieldGadget;
-use snarkvm_models::gadgets::curves::FpGadget;
 use snarkvm_r1cs::ConstraintSystem;
 use snarkvm_r1cs::SynthesisError;
 
diff --git a/compiler/src/value/group/targets/edwards_bls12.rs b/compiler/src/value/group/targets/edwards_bls12.rs
index 2c97a3210c..8a93a6db2b 100644
--- a/compiler/src/value/group/targets/edwards_bls12.rs
+++ b/compiler/src/value/group/targets/edwards_bls12.rs
@@ -29,6 +29,10 @@ use snarkvm_fields::Fp256;
 use snarkvm_fields::One;
 use snarkvm_fields::Zero;
 use snarkvm_gadgets::curves::edwards_bls12::EdwardsBlsGadget;
+use snarkvm_gadgets::curves::AllocatedFp;
+use snarkvm_gadgets::curves::FieldGadget;
+use snarkvm_gadgets::curves::FpGadget;
+use snarkvm_gadgets::curves::GroupGadget;
 use snarkvm_gadgets::traits::utilities::alloc::AllocGadget;
 use snarkvm_gadgets::traits::utilities::boolean::Boolean;
 use snarkvm_gadgets::traits::utilities::eq::ConditionalEqGadget;
@@ -40,10 +44,6 @@ use snarkvm_gadgets::traits::utilities::ToBitsGadget;
 use snarkvm_gadgets::traits::utilities::ToBytesGadget;
 use snarkvm_models::curves::AffineCurve;
 use snarkvm_models::curves::TEModelParameters;
-use snarkvm_models::gadgets::curves::AllocatedFp;
-use snarkvm_models::gadgets::curves::FieldGadget;
-use snarkvm_models::gadgets::curves::FpGadget;
-use snarkvm_models::gadgets::curves::GroupGadget;
 use snarkvm_r1cs::ConstraintSystem;
 use snarkvm_r1cs::SynthesisError;
 use std::borrow::Borrow;