Remove unused methods in zkapp interfaces

Author: sebastiencs

ledger/src/zkapps/intefaces.rs

@@ -110,9 +110,6 @@ where
     type Bool: BoolInterface;
 
     fn zero() -> Self;
-    fn equal(&self, other: &Self) -> Self::Bool;
-    fn add_flagged(&self, other: &Self, w: &mut Self::W) -> (Self, Self::Bool);
-    fn add_signed_flagged(&self, signed: &impl SignedAmountInterface) -> (Self, Self::Bool);
     fn of_constant_fee(fee: currency::Fee) -> Self;
 }
 
@@ -147,7 +144,6 @@ where
     type Amount: AmountInterface;
     type SignedAmount: SignedAmountInterface;
 
-    fn sub_amount_flagged(&self, amount: Self::Amount) -> (Self, Self::Bool);
     fn add_signed_amount_flagged(
         &self,
         signed_amount: Self::SignedAmount,
@@ -185,8 +181,6 @@ pub trait GlobalSlotSinceGenesisInterface {
     type W: WitnessGenerator<Fp>;
     type Bool: BoolInterface;
 
-    fn zero() -> Self;
-    fn greater_than(&self, other: &Self) -> Self::Bool;
     fn equal(&self, other: &Self, w: &mut Self::W) -> Self::Bool;
 }
 
@@ -195,7 +189,6 @@ pub trait GlobalSlotSpanInterface {
     type Bool: BoolInterface;
     type SlotSpan;
 
-    fn zero() -> Self;
     fn greater_than(this: &Self::SlotSpan, other: &Self::SlotSpan, w: &mut Self::W) -> Self::Bool;
 }
 
@@ -261,7 +254,6 @@ where
 
     fn empty() -> Self;
     fn is_empty(&self, w: &mut Self::W) -> Self::Bool;
-    fn pop_exn(&self) -> (Self::Elt, Self);
     fn pop(&self, w: &mut Self::W) -> Opt<(Self::Elt, Self)>;
     fn push(elt: Self::Elt, onto: Self, w: &mut Self::W) -> Self;
 }
@@ -412,7 +404,7 @@ pub trait TransactionCommitmentInterface {
     type W: WitnessGenerator<Fp>;
 
     fn empty() -> Fp;
-    fn commitment(account_updates: &Self::CallForest, w: &mut Self::W) -> Fp;
+    fn commitment(account_updates: &Self::CallForest) -> Fp;
     fn full_commitment(
         account_updates: &Self::AccountUpdate,
         memo_hash: Fp,

ledger/src/zkapps/mod.rs

@@ -1,5 +1,3 @@
-#![allow(unused)]
-
 pub mod intefaces;
 pub mod non_snark;
 pub mod snark;

ledger/src/zkapps/non_snark.rs

@@ -1,3 +1,5 @@
+#![allow(unused)]
+
 use mina_hasher::Fp;
 
 use crate::{
@@ -51,15 +53,6 @@ impl AmountInterface for Amount {
     fn zero() -> Self {
         todo!()
     }
-    fn equal(&self, other: &Self) -> Self::Bool {
-        todo!()
-    }
-    fn add_flagged(&self, other: &Self, w: &mut Self::W) -> (Self, Self::Bool) {
-        todo!()
-    }
-    fn add_signed_flagged(&self, signed: &impl SignedAmountInterface) -> (Self, Self::Bool) {
-        todo!()
-    }
     fn of_constant_fee(fee: crate::scan_state::currency::Fee) -> Self {
         todo!()
     }
@@ -145,9 +138,6 @@ impl StackInterface for CallStack {
     fn is_empty(&self, w: &mut Self::W) -> Boolean {
         todo!()
     }
-    fn pop_exn(&self) -> (Self::Elt, Self) {
-        todo!()
-    }
     fn pop(&self, w: &mut Self::W) -> Opt<(Self::Elt, Self)> {
         todo!()
     }

ledger/src/zkapps/snark.rs

@@ -327,15 +327,6 @@ impl AmountInterface for SnarkAmount {
     fn zero() -> Self {
         <CheckedAmount<_> as CheckedCurrency<Fp>>::zero()
     }
-    fn equal(&self, other: &Self) -> Self::Bool {
-        todo!()
-    }
-    fn add_flagged(&self, other: &Self, w: &mut Self::W) -> (Self, Self::Bool) {
-        todo!()
-    }
-    fn add_signed_flagged(&self, signed: &impl SignedAmountInterface) -> (Self, Self::Bool) {
-        todo!()
-    }
     fn of_constant_fee(fee: crate::scan_state::currency::Fee) -> Self {
         Amount::of_fee(&fee).to_checked()
     }
@@ -362,7 +353,7 @@ impl CallForestInterface for SnarkCallForest {
         field::equal(empty, *hash, w).var()
     }
     fn pop_exn(&self, w: &mut Self::W) -> ((Self::AccountUpdate, Self), Self) {
-        let Self { data, hash } = self;
+        let Self { data, hash: _ } = self;
         let hd_r = &data.first().unwrap().elt;
         let account_update = &hd_r.account_update;
         let auth = &account_update.authorization;
@@ -388,7 +379,7 @@ impl CallForestInterface for SnarkCallForest {
         });
         let tree_hash = [account_update.hash, subforest.hash]
             .checked_hash_with_param(Tree::<AccountUpdate>::HASH_PARAM, w);
-        let hash_cons =
+        let _hash_cons =
             [tree_hash, tl_hash].checked_hash_with_param(ACCOUNT_UPDATE_CONS_HASH_PARAM, w);
         let account = Self::AccountUpdate {
             body: account_update,
@@ -518,9 +509,6 @@ impl StackInterface for WithHash<Vec<WithStackHash<WithHash<StackFrame>>>> {
         let empty = Fp::zero();
         field::equal(empty, *hash, w).var()
     }
-    fn pop_exn(&self) -> (Self::Elt, Self) {
-        todo!()
-    }
     fn pop(&self, w: &mut Self::W) -> Opt<(Self::Elt, Self)> {
         let Self { data, hash } = self;
         let input_is_empty = self.is_empty(w);
@@ -661,12 +649,6 @@ impl GlobalSlotSinceGenesisInterface for SnarkGlobalSlot {
     type W = Witness<Fp>;
     type Bool = SnarkBool;
 
-    fn zero() -> Self {
-        todo!()
-    }
-    fn greater_than(&self, other: &Self) -> Self::Bool {
-        todo!()
-    }
     fn equal(&self, other: &Self, w: &mut Self::W) -> Self::Bool {
         <Self as CheckedNat<_, 32>>::equal(&self, other, w).var()
     }
@@ -813,7 +795,7 @@ impl LocalStateInterface for zkapp_logic::LocalState<ZkappSnark> {
 
     fn add_check(
         local: &mut zkapp_logic::LocalState<Self::Z>,
-        failure: TransactionFailure,
+        _failure: TransactionFailure,
         b: Self::Bool,
         w: &mut Self::W,
     ) {
@@ -1102,7 +1084,10 @@ impl LedgerInterface for LedgerWithHash {
         account_update: &Self::AccountUpdate,
         w: &mut Self::W,
     ) -> (Self::Account, Self::InclusionProof) {
-        let Self { ledger, hash: root } = self;
+        let Self {
+            ledger,
+            hash: _root,
+        } = self;
         let idx = ledger.find_index_exn(account_update.body.account_id());
         let account = w.exists(AccountUnhashed(ledger.get_exn(&idx)));
         // TODO: Don't clone here
@@ -1256,9 +1241,6 @@ impl BalanceInterface for SnarkBalance {
     type Amount = SnarkAmount;
     type SignedAmount = SnarkSignedAmount;
 
-    fn sub_amount_flagged(&self, amount: Self::Amount) -> (Self, Self::Bool) {
-        todo!()
-    }
     fn add_signed_amount_flagged(
         &self,
         signed_amount: Self::SignedAmount,
@@ -1278,7 +1260,7 @@ impl TransactionCommitmentInterface for SnarkTransactionCommitment {
         Fp::zero()
     }
 
-    fn commitment(account_updates: &Self::CallForest, w: &mut Self::W) -> Fp {
+    fn commitment(account_updates: &Self::CallForest) -> Fp {
         let Self::CallForest {
             data: _,
             hash: account_updates_hash,
@@ -1347,7 +1329,7 @@ impl ControllerInterface for SnarkController {
     type SingleData = ZkappSingleData;
 
     fn check(
-        proof_verifies: Self::Bool,
+        _proof_verifies: Self::Bool,
         signature_verifies: Self::Bool,
         auth: &AuthRequired,
         single_data: &Self::SingleData,
@@ -1384,10 +1366,6 @@ impl GlobalSlotSpanInterface for SnarkGlobalSlotSpan {
     type Bool = SnarkBool;
     type SlotSpan = SlotSpan;
 
-    fn zero() -> Self {
-        todo!()
-    }
-
     fn greater_than(this: &Self::SlotSpan, other: &Self::SlotSpan, w: &mut Self::W) -> Self::Bool {
         let this = this.to_checked::<Fp>();
         let other = other.to_checked::<Fp>();

ledger/src/zkapps/zkapp_logic.rs

@@ -1,17 +1,12 @@
-#![allow(unused)]
-
 use mina_hasher::Fp;
 use mina_signer::CompressedPubKey;
 
-use crate::scan_state::transaction_logic::zkapp_command::{
-    Actions, Numeric, SetOrKeep, ZkAppPreconditions,
-};
+use crate::scan_state::transaction_logic::zkapp_command::{Actions, SetOrKeep};
 use crate::Permissions;
 use crate::{
-    proofs::{numbers::nat::CheckedNat, transaction::transaction_snark::CONSTRAINT_CONSTANTS},
+    proofs::transaction::transaction_snark::CONSTRAINT_CONSTANTS,
     scan_state::{
-        currency::{Amount, Magnitude, SlotSpan},
-        scan_state::ConstraintConstants,
+        currency::{Magnitude, SlotSpan},
         transaction_logic::{
             protocol_state::GlobalStateSkeleton, zkapp_command::CheckAuthorizationResult,
             TransactionFailure,
@@ -20,11 +15,10 @@ use crate::{
     zkapps::intefaces::*,
     AuthRequired, AuthRequiredEncoded, MyCow, TokenId, VerificationKey,
 };
-use ark_ff::{One, Zero};
 
 use crate::proofs::{
     field::{Boolean, ToBoolean},
-    zkapp::{StartDataSkeleton, ZkappSingleData},
+    zkapp::StartDataSkeleton,
 };
 
 pub enum IsStart<T> {
@@ -458,7 +452,7 @@ where
             ),
             IsStart::Yes(start_data) | IsStart::Compute(start_data) => {
                 let tx_commitment_on_start =
-                    Z::TransactionCommitment::commitment(remaining.calls(), w);
+                    Z::TransactionCommitment::commitment(remaining.calls());
                 let full_tx_commitment_on_start = Z::TransactionCommitment::full_commitment(
                     &account_update,
                     start_data.memo_hash,
@@ -654,7 +648,6 @@ where
             w,
         );
         let timing = w.exists_no_check({
-            use crate::scan_state::transaction_logic::zkapp_command::SetOrKeep;
             match timing {
                 SetOrKeep::Set(timing) => timing.clone().to_account_timing(),
                 SetOrKeep::Keep => a.get().timing.clone(),