fix: update to insert_account_info

privacy-scaling-explorations · Jul 10, 2022 · 6bf26cc · 6bf26cc
1 parent 7e84b2c
commit 6bf26cc
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 20 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -48,4 +48,4 @@ jobs:
         run: cargo fmt --all -- --check
 
       - name: Run clippy
-        run: cargo clippy --all --all-features -- -D warnings
+        run: cargo clippy --all --all-features --all-targets -- -D warnings
diff --git a/src/loader/evm/test.rs b/src/loader/evm/test.rs
@@ -35,7 +35,7 @@ pub fn execute(code: Vec<u8>, calldata: Vec<u8>) -> (bool, u64, Vec<u64>) {
     let mut evm = builder.build(Backend::simple());
 
     evm.db
-        .insert_cache(callee, AccountInfo::new(0.into(), 1, code.into()));
+        .insert_account_info(callee, AccountInfo::new(0.into(), 1, code.into()));
 
     let result = evm
         .call_raw(caller, callee, calldata.into(), 0.into())

diff --git a/src/protocol.rs b/src/protocol.rs
@@ -22,20 +22,4 @@ impl<C: Curve> Protocol<C> {
     pub fn vanishing_poly(&self) -> usize {
         self.preprocessed.len() + self.num_statement + self.num_auxiliary.iter().sum::<usize>()
     }
-
-    pub fn langranges<T>(&self, statements: &[Vec<T>]) -> impl IntoIterator<Item = i32> {
-        self.relations
-            .iter()
-            .cloned()
-            .sum::<Expression<_>>()
-            .used_langrange()
-            .into_iter()
-            .chain(
-                0..statements
-                    .iter()
-                    .map(|statement| statement.len())
-                    .max()
-                    .unwrap_or_default() as i32,
-            )
-    }
 }
diff --git a/src/scheme/kzg.rs b/src/scheme/kzg.rs
@@ -1,3 +1,8 @@
+use crate::{
+    protocol::Protocol,
+    util::{Curve, Expression},
+};
+
 mod accumulation;
 mod msm;
 
@@ -6,3 +11,23 @@ pub use accumulation::{
     AccumulationStrategy, Accumulator, SameCurveAccumulation,
 };
 pub use msm::MSM;
+
+pub fn langranges<C: Curve, T>(
+    protocol: &Protocol<C>,
+    statements: &[Vec<T>],
+) -> impl IntoIterator<Item = i32> {
+    protocol
+        .relations
+        .iter()
+        .cloned()
+        .sum::<Expression<_>>()
+        .used_langrange()
+        .into_iter()
+        .chain(
+            0..statements
+                .iter()
+                .map(|statement| statement.len())
+                .max()
+                .unwrap_or_default() as i32,
+        )
+}
diff --git a/src/scheme/kzg/accumulation/plonk.rs b/src/scheme/kzg/accumulation/plonk.rs
@@ -3,6 +3,7 @@ use crate::{
     protocol::Protocol,
     scheme::kzg::{
         accumulation::{AccumulationScheme, AccumulationStrategy, Accumulator},
+        langranges,
         msm::MSM,
     },
     util::{
@@ -42,7 +43,7 @@ where
             let mut common_poly_eval = CommonPolynomialEvaluation::new(
                 &protocol.domain,
                 loader,
-                protocol.langranges(&proof.statements),
+                langranges(protocol, &proof.statements),
                 &proof.z,
             );
 

diff --git a/src/scheme/kzg/accumulation/shplonk.rs b/src/scheme/kzg/accumulation/shplonk.rs
@@ -3,6 +3,7 @@ use crate::{
     protocol::Protocol,
     scheme::kzg::{
         accumulation::{AccumulationScheme, AccumulationStrategy, Accumulator},
+        langranges,
         msm::MSM,
     },
     util::{
@@ -45,7 +46,7 @@ where
             let mut common_poly_eval = CommonPolynomialEvaluation::new(
                 &protocol.domain,
                 loader,
-                protocol.langranges(&proof.statements),
+                langranges(protocol, &proof.statements),
                 &proof.z,
             );
             let mut sets = intermediate_sets(protocol, loader, &proof.z, &proof.z_prime);