From 8ff7f3cd1bea65253492a3acb3120c0baf3049e7 Mon Sep 17 00:00:00 2001
From: Georgios Konstantopoulos <me@gakonst.com>
Date: Mon, 26 Jul 2021 17:32:18 +0300
Subject: [PATCH] refactor: rename circom_wasm to witness

---
 src/{circom_wasm => witness}/circom.rs                 |  7 +++----
 src/{circom_wasm => witness}/memory.rs                 |  0
 src/{circom_wasm => witness}/mod.rs                    | 10 ++++------
 .../wasm.rs => witness/witness_calculator.rs}          |  6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)
 rename src/{circom_wasm => witness}/circom.rs (93%)
 rename src/{circom_wasm => witness}/memory.rs (100%)
 rename src/{circom_wasm => witness}/mod.rs (65%)
 rename src/{circom_wasm/wasm.rs => witness/witness_calculator.rs} (98%)

diff --git a/src/circom_wasm/circom.rs b/src/witness/circom.rs
similarity index 93%
rename from src/circom_wasm/circom.rs
rename to src/witness/circom.rs
index a637009..d9e9dbb 100644
--- a/src/circom_wasm/circom.rs
+++ b/src/witness/circom.rs
@@ -2,12 +2,11 @@ use color_eyre::Result;
 use wasmer::{Function, Instance, Value};
 
 #[derive(Clone, Debug)]
-pub struct CircomInstance(Instance);
+pub struct Wasm(Instance);
 
-// binds to the circom functions
-impl CircomInstance {
+impl Wasm {
     pub fn new(instance: Instance) -> Self {
-        CircomInstance(instance)
+        Self(instance)
     }
 
     pub fn init(&self, sanity_check: bool) -> Result<()> {
diff --git a/src/circom_wasm/memory.rs b/src/witness/memory.rs
similarity index 100%
rename from src/circom_wasm/memory.rs
rename to src/witness/memory.rs
diff --git a/src/circom_wasm/mod.rs b/src/witness/mod.rs
similarity index 65%
rename from src/circom_wasm/mod.rs
rename to src/witness/mod.rs
index 9499f2a..6112a06 100644
--- a/src/circom_wasm/mod.rs
+++ b/src/witness/mod.rs
@@ -1,17 +1,15 @@
-mod wasm;
-pub use wasm::WitnessCalculator;
+mod witness_calculator;
+pub use witness_calculator::WitnessCalculator;
 
 mod memory;
-pub use memory::SafeMemory;
+pub(super) use memory::SafeMemory;
 
 mod circom;
-pub use circom::CircomInstance;
+pub(super) use circom::Wasm;
 
 use fnv::FnvHasher;
 use std::hash::Hasher;
 
-pub use num_bigint::BigInt;
-
 pub(crate) fn fnv(inp: &str) -> (u32, u32) {
     let mut hasher = FnvHasher::default();
     hasher.write(inp.as_bytes());
diff --git a/src/circom_wasm/wasm.rs b/src/witness/witness_calculator.rs
similarity index 98%
rename from src/circom_wasm/wasm.rs
rename to src/witness/witness_calculator.rs
index 2c5ac6d..2c193b8 100644
--- a/src/circom_wasm/wasm.rs
+++ b/src/witness/witness_calculator.rs
@@ -4,11 +4,11 @@ use num_traits::Zero;
 use std::cell::Cell;
 use wasmer::{imports, Function, Instance, Memory, MemoryType, Module, Store};
 
-use super::{fnv, CircomInstance, SafeMemory};
+use super::{fnv, SafeMemory, Wasm};
 
 #[derive(Clone, Debug)]
 pub struct WitnessCalculator {
-    pub instance: CircomInstance,
+    pub instance: Wasm,
     pub memory: SafeMemory,
     pub n64: i32,
 }
@@ -34,7 +34,7 @@ impl WitnessCalculator {
                 "log" => runtime::log_component(&store),
             }
         };
-        let instance = CircomInstance::new(Instance::new(&module, &import_object)?);
+        let instance = Wasm::new(Instance::new(&module, &import_object)?);
 
         let n32 = (instance.get_fr_len()? >> 2) - 2;