From 4747112118f33213b7dba91afa846f2b7d0caf67 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Sun, 14 Feb 2021 09:24:15 -0700 Subject: [PATCH 1/2] Downgrade to funty 1.1.0 to fix CI. --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index d9ec9ff..25c9445 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,6 +48,9 @@ blake2b_simd = "0.5" lazy_static = "1.4.0" static_assertions = "1.1.0" +# Temporary workaround for https://github.com/myrrlyn/funty/issues/3 +funty = "=1.1.0" + # Developer tooling dependencies plotters = { version = "0.3.0", optional = true } tabbycat = { version = "0.1", features = ["attributes"], optional = true } From 4b960a7c0c6d0412bc7387fa9497c3701230f42f Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Sun, 14 Feb 2021 09:28:51 -0700 Subject: [PATCH 2/2] cargo fmt --- src/plonk/lookup/prover.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plonk/lookup/prover.rs b/src/plonk/lookup/prover.rs index 4df79a7..170f5e5 100644 --- a/src/plonk/lookup/prover.rs +++ b/src/plonk/lookup/prover.rs @@ -291,11 +291,13 @@ impl<'a, C: CurveAffine> Permuted<'a, C> { left *= &(*gamma + permuted_table_value); let mut right = z[prev_idx]; - let mut input_term = self.unpermuted_input_columns + let mut input_term = self + .unpermuted_input_columns .iter() .fold(C::Scalar::zero(), |acc, input| acc * &*theta + &input[i]); - let mut table_term = self.unpermuted_table_columns + let mut table_term = self + .unpermuted_table_columns .iter() .fold(C::Scalar::zero(), |acc, table| acc * &*theta + &table[i]);