From 12cef1755984137430ffe7df04bd368f7b487f10 Mon Sep 17 00:00:00 2001
From: therealyingtong <yingtong@z.cash>
Date: Tue, 29 Jun 2021 12:02:54 +0800
Subject: [PATCH] Cleanups and minor refactors.

Co-authored-by: Jack Grigg <jack@electriccoin.co>
---
 src/circuit/gadget/sinsemilla.rs      | 6 ++----
 src/circuit/gadget/sinsemilla/chip.rs | 6 ------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/circuit/gadget/sinsemilla.rs b/src/circuit/gadget/sinsemilla.rs
index 48f559c9..9cde750c 100644
--- a/src/circuit/gadget/sinsemilla.rs
+++ b/src/circuit/gadget/sinsemilla.rs
@@ -139,8 +139,8 @@ where
         Self {
             chip,
             inner: pieces
-                .iter()
-                .map(|piece| piece.inner.clone())
+                .into_iter()
+                .map(|piece| piece.inner)
                 .collect::<Vec<_>>()
                 .into(),
         }
@@ -354,13 +354,11 @@ mod tests {
                 meta.fixed_column(),
                 meta.fixed_column(),
             ];
-            let constants_3 = meta.fixed_column();
 
             let perm = meta.permutation(
                 &advices
                     .iter()
                     .map(|advice| (*advice).into())
-                    .chain(Some(constants_3.into()))
                     .chain(constants_1.iter().map(|fixed| (*fixed).into()))
                     .chain(constants_2.iter().map(|fixed| (*fixed).into()))
                     .collect::<Vec<_>>(),
diff --git a/src/circuit/gadget/sinsemilla/chip.rs b/src/circuit/gadget/sinsemilla/chip.rs
index e274e119..fcffc2ba 100644
--- a/src/circuit/gadget/sinsemilla/chip.rs
+++ b/src/circuit/gadget/sinsemilla/chip.rs
@@ -72,12 +72,6 @@ pub struct SinsemillaConfig {
     pub(super) lookup_config_4: LookupRangeCheckConfig<pallas::Base, { sinsemilla::K }>,
 }
 
-impl SinsemillaConfig {
-    pub fn advices(&self) -> [Column<Advice>; 5] {
-        [self.bits, self.lambda_1, self.lambda_2, self.x_a, self.x_p]
-    }
-}
-
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub struct SinsemillaChip {
     config: SinsemillaConfig,