Merge pull request #14 from rymnc/implement-band

chore(ops): implement band

src/field.rs

@@ -215,3 +215,7 @@ pub unsafe fn Fr_lor(to: *mut FrElement, a: *const FrElement, b: *const FrElemen
 pub unsafe fn Fr_shl(to: *mut FrElement, a: *const FrElement, b: *const FrElement) {
     binop(Operation::Shl, to, a, b);
 }
+
+pub unsafe fn Fr_band(to: *mut FrElement, a: *const FrElement, b: *const FrElement) {
+    binop(Operation::Band, to, a, b)
+}

src/generate.rs

@@ -70,7 +70,7 @@ mod ffi {
         // unsafe fn Fr_square(to: *mut FrElement, a: *const FrElement);
         unsafe fn Fr_shl(to: *mut FrElement, a: *const FrElement, b: *const FrElement);
         // fn Fr_shr(to: &mut FrElement, a: &FrElement, b: u32);
-        // fn Fr_band(to: &mut FrElement, a: &FrElement, b: &FrElement);
+        unsafe fn Fr_band(to: &mut FrElement, a: *const FrElement, b: *const FrElement);
         // fn Fr_bor(to: &mut FrElement, a: &FrElement, b: &FrElement);
         // fn Fr_bxor(to: &mut FrElement, a: &FrElement, b: &FrElement);
         // fn Fr_bnot(to: &mut FrElement, a: &FrElement);
@@ -237,7 +237,10 @@ pub fn build_witness() -> eyre::Result<()> {
     eprintln!("Calculation took: {:?}", now.elapsed());
 
     let signal_values = get_witness_to_signal();
-    let mut signals = signal_values.into_iter().map(|i| ctx.signalValues[i].0).collect::<Vec<_>>();
+    let mut signals = signal_values
+        .into_iter()
+        .map(|i| ctx.signalValues[i].0)
+        .collect::<Vec<_>>();
     let mut nodes = field::get_graph();
     eprintln!("Graph with {} nodes", nodes.len());
 

src/graph.rs

@@ -1,4 +1,7 @@
-use std::{collections::HashMap, ops::Shl};
+use std::{
+    collections::HashMap,
+    ops::{BitAnd, Shl},
+};
 
 use crate::field::M;
 use ark_bn254::Fr;
@@ -42,6 +45,7 @@ pub enum Operation {
     Geq,
     Lor,
     Shl,
+    Band,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -68,6 +72,7 @@ impl Operation {
             Geq => U256::from(a >= b),
             Lor => U256::from(a != U256::ZERO || b != U256::ZERO),
             Shl => compute_shl_uint(a, b),
+            Band => a.bitand(b),
             _ => unimplemented!("operator {:?} not implemented", self),
         }
     }