diff --git a/src/coprocessor/mod.rs b/src/coprocessor/mod.rs index ec942d4971..abcdd1b903 100644 --- a/src/coprocessor/mod.rs +++ b/src/coprocessor/mod.rs @@ -10,7 +10,6 @@ use crate::{ pub mod circom; pub mod gadgets; -pub mod memoset; pub mod sha256; pub mod trie; diff --git a/src/coprocessor/memoset/demo.rs b/src/coroutine/memoset/demo.rs similarity index 99% rename from src/coprocessor/memoset/demo.rs rename to src/coroutine/memoset/demo.rs index 6b5c601819..0b4e71b7fe 100644 --- a/src/coprocessor/memoset/demo.rs +++ b/src/coroutine/memoset/demo.rs @@ -5,8 +5,8 @@ use super::{ CircuitScope, CircuitTranscript, LogMemo, Scope, }; use crate::circuit::gadgets::constraints::alloc_is_zero; +use crate::circuit::gadgets::pointer::AllocatedPtr; use crate::coprocessor::gadgets::construct_list; -use crate::coprocessor::AllocatedPtr; use crate::field::LurkField; use crate::lem::circuit::GlobalAllocator; use crate::lem::{pointers::Ptr, store::Store}; diff --git a/src/coprocessor/memoset/mod.rs b/src/coroutine/memoset/mod.rs similarity index 99% rename from src/coprocessor/memoset/mod.rs rename to src/coroutine/memoset/mod.rs index 3d52120498..fd019827ad 100644 --- a/src/coprocessor/memoset/mod.rs +++ b/src/coroutine/memoset/mod.rs @@ -34,11 +34,11 @@ use bellpepper_core::{boolean::Boolean, num::AllocatedNum, ConstraintSystem, Syn use itertools::Itertools; use once_cell::sync::OnceCell; -use super::gadgets::construct_cons; use crate::circuit::gadgets::{ constraints::{enforce_equal, enforce_equal_zero, invert, sub}, pointer::AllocatedPtr, }; +use crate::coprocessor::gadgets::construct_cons; // FIXME: Move to common location. use crate::field::LurkField; use crate::lem::circuit::GlobalAllocator; use crate::lem::tag::Tag; diff --git a/src/coprocessor/memoset/multiset.rs b/src/coroutine/memoset/multiset.rs similarity index 100% rename from src/coprocessor/memoset/multiset.rs rename to src/coroutine/memoset/multiset.rs diff --git a/src/coprocessor/memoset/query.rs b/src/coroutine/memoset/query.rs similarity index 96% rename from src/coprocessor/memoset/query.rs rename to src/coroutine/memoset/query.rs index 617feebbb3..04ddd43f1d 100644 --- a/src/coprocessor/memoset/query.rs +++ b/src/coroutine/memoset/query.rs @@ -1,7 +1,7 @@ use bellpepper_core::{ConstraintSystem, SynthesisError}; use super::{CircuitScope, CircuitTranscript, LogMemo, Scope}; -use crate::coprocessor::AllocatedPtr; +use crate::circuit::gadgets::pointer::AllocatedPtr; use crate::field::LurkField; use crate::lem::circuit::GlobalAllocator; use crate::lem::{pointers::Ptr, store::Store}; diff --git a/src/coroutine/mod.rs b/src/coroutine/mod.rs new file mode 100644 index 0000000000..ab15f504ad --- /dev/null +++ b/src/coroutine/mod.rs @@ -0,0 +1 @@ +pub mod memoset; diff --git a/src/lib.rs b/src/lib.rs index 47b5f72cca..4728106ee3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,6 +6,7 @@ pub mod circuit; pub mod cli; pub mod config; pub mod coprocessor; +pub mod coroutine; pub mod error; pub mod eval; pub mod field;