Move memoset to coroutine module.

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;
 

src/coprocessor/memoset/demo.rs → 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};

src/coprocessor/memoset/mod.rs → 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;

src/coprocessor/memoset/query.rs → 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};

src/coroutine/mod.rs

@@ -0,0 +1 @@
+pub mod memoset;

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;