Merge pull request #58 from namnc/fix-warnings

Fix warnings
namnc · May 13, 2024 · e41f4bf · e41f4bf
2 parents 16de04d + ae52138
commit e41f4bf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/circuit.rs b/src/circuit.rs
@@ -18,6 +18,7 @@ use serde::{Deserialize, Serialize};
 use sim_circuit::circuit::{Circuit as SimCircuit, Gate as SimGate, Node as SimNode, Operation};
 use std::collections::HashMap;
 use thiserror::Error;
+use sim_circuit::circuit::CircuitError as SimCircuitError;
 
 /// Types of gates that can be used in an arithmetic circuit.
 #[derive(Debug, Serialize, Deserialize)]
@@ -446,14 +447,14 @@ impl ArithmeticCircuit {
             {
                 new_node.set_value(value);
             }
-            sim_circuit.add_node(id, new_node);
+            sim_circuit.add_node(id, new_node)?;
         }
 
         // Add gates
         for gate in &self.gates {
             let operation = Operation::from(&gate.op);
             let sim_gate = SimGate::new(operation, gate.lh_in, gate.rh_in, gate.out);
-            sim_circuit.add_gate(sim_gate);
+            sim_circuit.add_gate(sim_gate)?;
         }
 
         Ok(sim_circuit)
@@ -528,6 +529,8 @@ pub enum CircuitError {
     MPZCircuitError(MpzCircuitError),
     #[error("MPZ arithmetic circuit builder error")]
     MPZCircuitBuilderError,
+    #[error("Circuit simulation error")]
+    SimCircuitError(SimCircuitError),
     #[error(transparent)]
     ParseIntError(#[from] std::num::ParseIntError),
     #[error("Signal already declared")]
@@ -549,3 +552,9 @@ impl From<MpzCircuitError> for CircuitError {
         CircuitError::MPZCircuitError(e)
     }
 }
+
+impl From<SimCircuitError> for CircuitError {
+    fn from(e: SimCircuitError) -> Self {
+        CircuitError::SimCircuitError(e)
+    }
+}
diff --git a/tests/mat_elem_mul.rs b/tests/mat_elem_mul.rs
@@ -6,7 +6,7 @@ const TEST_FILE_PATH: &str = "./tests/circuits/matElemMul.circom";
 fn test_matrix_element_multiplication() {
     let input = Input::new(TEST_FILE_PATH.into(), "./".into()).unwrap();
     let circuit = build_circuit(&input).unwrap();
-    let mut sim_circuit = circuit.build_sim_circuit().unwrap();
+    let sim_circuit = circuit.build_sim_circuit().unwrap();
 
     let circuit_input = vec![2, 2, 2, 2, 2, 2, 2, 2];
     let res = sim_circuit.execute(&circuit_input).unwrap();

diff --git a/tests/sum.rs b/tests/sum.rs
@@ -6,7 +6,7 @@ const TEST_FILE_PATH: &str = "./tests/circuits/sum.circom";
 fn test_sum() {
     let input = Input::new(TEST_FILE_PATH.into(), "./".into()).unwrap();
     let circuit = build_circuit(&input).unwrap();
-    let mut sim_circuit = circuit.build_sim_circuit().unwrap();
+    let sim_circuit = circuit.build_sim_circuit().unwrap();
 
     let circuit_input = vec![1, 2];
     let res = sim_circuit.execute(&circuit_input).unwrap();