diff --git a/compiler/src/constraints/expression.rs b/compiler/src/constraints/expression.rs index 789ca637fe..6203de88d9 100644 --- a/compiler/src/constraints/expression.rs +++ b/compiler/src/constraints/expression.rs @@ -2,13 +2,13 @@ use crate::{ comparator::{ComparatorGadget, EvaluateLtGadget}, - constraints::{ - boolean::{enforce_and, enforce_or, evaluate_not, new_bool_constant}, - new_scope, - ConstrainedProgram, - }, + constraints::{new_scope, ConstrainedProgram}, errors::ExpressionError, - value::{ConstrainedCircuitMember, ConstrainedValue}, + value::{ + boolean::{enforce_and, enforce_or, evaluate_not, new_bool_constant}, + ConstrainedCircuitMember, + ConstrainedValue, + }, Address, FieldType, GroupType, diff --git a/compiler/src/constraints/function.rs b/compiler/src/constraints/function.rs index 1746e7e7f8..9c6e4918aa 100644 --- a/compiler/src/constraints/function.rs +++ b/compiler/src/constraints/function.rs @@ -3,15 +3,9 @@ use crate::{ address::Address, - constraints::{ - boolean::bool_from_input, - field::field_from_input, - group::group_from_input, - new_scope, - ConstrainedProgram, - }, + constraints::{field::field_from_input, group::group_from_input, new_scope, ConstrainedProgram}, errors::{FunctionError, StatementError}, - value::ConstrainedValue, + value::{boolean::bool_from_input, ConstrainedValue}, GroupType, Integer, }; diff --git a/compiler/src/constraints/mod.rs b/compiler/src/constraints/mod.rs index 17ff9424bf..e1f8facdc4 100644 --- a/compiler/src/constraints/mod.rs +++ b/compiler/src/constraints/mod.rs @@ -1,7 +1,5 @@ //! Module containing methods to enforce constraints in an Leo program -pub mod boolean; - pub(crate) mod comparator; pub(crate) use comparator::*; diff --git a/compiler/src/constraints/boolean.rs b/compiler/src/value/boolean.rs similarity index 100% rename from compiler/src/constraints/boolean.rs rename to compiler/src/value/boolean.rs diff --git a/compiler/src/value/mod.rs b/compiler/src/value/mod.rs index 4bf21dbbeb..4a73101104 100644 --- a/compiler/src/value/mod.rs +++ b/compiler/src/value/mod.rs @@ -1,2 +1,4 @@ +pub mod boolean; + pub mod value; pub use self::value::*; diff --git a/compiler/src/value/value.rs b/compiler/src/value/value.rs index 4a342d87b0..1c5ebeedc1 100644 --- a/compiler/src/value/value.rs +++ b/compiler/src/value/value.rs @@ -1,7 +1,7 @@ //! The in memory stored value for a defined name in a resolved Leo program. use crate::{ - constraints::boolean::{allocate_bool, new_bool_constant}, + boolean::{allocate_bool, new_bool_constant}, errors::{ExpressionError, FieldError, ValueError}, is_in_scope, new_scope,