fix playground code and fix cli dry run bug

DelphinusLab · Oct 9, 2023 · 29f23ea · 29f23ea
1 parent 0153507
commit 29f23ea
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/crates/cli/src/app_builder.rs b/crates/cli/src/app_builder.rs
@@ -136,7 +136,7 @@ pub trait AppBuilder: CommandBuilder {
                 } else {
                     assert!(public_inputs.len() <= Self::MAX_PUBLIC_INPUT_SIZE);
 
-                    let context_output = Rc::new(RefCell::new(vec![]));
+                    let context_output = Arc::new(Mutex::new(vec![]));
 
                     exec_dry_run(
                         zkwasm_k,
@@ -148,7 +148,7 @@ pub trait AppBuilder: CommandBuilder {
                         Arc::new(Mutex::new(vec![])),
                     )?;
 
-                    write_context_output(&context_output.borrow(), context_out_path)?;
+                    write_context_output(&context_output.lock().unwrap(), context_out_path)?;
 
                     Ok(())
                 }

diff --git a/crates/playground/Cargo.lock b/crates/playground/Cargo.lock
diff --git a/crates/playground/examples/binary_search.rs b/crates/playground/examples/binary_search.rs
@@ -1,5 +1,5 @@
-use std::cell::RefCell;
-use std::rc::Rc;
+use std::sync::Arc
+use std::sync::Mutex;
 
 use anyhow::Result;
 use delphinus_zkwasm::loader::ExecutionArg;
@@ -15,7 +15,7 @@ fn main() -> Result<()> {
         public_inputs: vec![0],
         private_inputs: vec![],
         context_inputs: vec![],
-        context_outputs: Rc::new(RefCell::new(vec![])),
+        context_outputs: Arc::new(Mutex::new(vec![])),
     })?;
     loader.mock_test(&circuit, &instances)
 }
diff --git a/crates/playground/examples/context.rs b/crates/playground/examples/context.rs
@@ -1,5 +1,5 @@
-use std::cell::RefCell;
-use std::rc::Rc;
+use std::sync::Arc;
+use std::sync::Mutex;
 
 use anyhow::Result;
 use delphinus_zkwasm::loader::ExecutionArg;
@@ -10,7 +10,7 @@ fn main() -> Result<()> {
     let wasm = std::fs::read("wasm/context.wasm")?;
 
     let context_in: Vec<u64> = vec![2, 1];
-    let context_outputs = Rc::new(RefCell::new(vec![]));
+    let context_outputs = Arc::new(Mutex::new(vec![]));
 
     let loader = ZkWasmLoader::<Bn256>::new(18, wasm, vec![])?;
     let arg = ExecutionArg {
@@ -27,7 +27,7 @@ fn main() -> Result<()> {
         public_inputs: vec![],
         private_inputs: vec![],
         context_inputs: context_outputs.borrow().to_vec(),
-        context_outputs: Rc::new(RefCell::new(vec![])),
+        context_outputs: Arc::new(Mutex::new(vec![])),
     };
 
     let (circuit, instances) = loader.circuit_with_witness(arg)?;

diff --git a/crates/playground/examples/fibonacci.rs b/crates/playground/examples/fibonacci.rs
@@ -1,5 +1,5 @@
-use std::cell::RefCell;
-use std::rc::Rc;
+use std::sync::Arc;
+use std::sync::Mutex;
 
 use anyhow::Result;
 use delphinus_zkwasm::loader::ExecutionArg;
@@ -15,7 +15,7 @@ fn main() -> Result<()> {
         public_inputs: vec![5],
         private_inputs: vec![],
         context_inputs: vec![],
-        context_outputs: Rc::new(RefCell::new(vec![])),
+        context_outputs: Arc::new(Mutex::new(vec![])),
     })?;
     loader.mock_test(&circuit, &instances)
 }
diff --git a/crates/playground/examples/phantom.rs b/crates/playground/examples/phantom.rs
@@ -1,5 +1,5 @@
-use std::cell::RefCell;
-use std::rc::Rc;
+use std::sync::Arc;
+use std::sync::Mutex;
 
 use anyhow::Result;
 use delphinus_zkwasm::loader::ExecutionArg;
@@ -19,7 +19,7 @@ fn main() -> Result<()> {
         public_inputs: vec![2],
         private_inputs: vec![],
         context_inputs: vec![],
-        context_outputs: Rc::new(RefCell::new(vec![])),
+        context_outputs: Arc::new(Mutex::new(vec![])),
     })?;
     loader.mock_test(&circuit, &instances)
 }