Fix zkapps imports

Author: sebastiencs

ledger/src/proofs/mod.rs

@@ -23,7 +23,6 @@ pub mod verifier_index;
 pub mod witness;
 pub mod wrap;
 pub mod zkapp;
-pub mod zkapp_logic;
 
 pub type VerifierIndex = kimchi::verifier_index::VerifierIndex<Pallas>;
 pub type ProverProof = kimchi::proof::ProverProof<Pallas>;

ledger/src/proofs/zkapp.rs

@@ -36,7 +36,6 @@ use crate::{
         verifier_index::make_zkapp_verifier_index,
         wrap::{self, WrapParams, WrapProofState, WrapStatement},
         zkapp::group::{State, ZkappCommandIntermediateState},
-        zkapp_logic::{self, ApplyZkappParams},
     },
     scan_state::{
         currency::{Amount, Index, Signed, Slot},
@@ -63,6 +62,7 @@ use crate::{
     zkapps::{
         intefaces::ZkappApplication,
         snark::{zkapp_check::InSnarkCheck, AccountUnhashed, ZkappSnark},
+        zkapp_logic::{self, ApplyZkappParams},
     },
     AccountId, ControlTag, MyCow, ToInputs, TokenId, ZkAppAccount,
 };

ledger/src/zkapps/intefaces.rs

@@ -7,8 +7,8 @@ use crate::proofs::field::{Boolean, FieldWitness};
 use crate::proofs::to_field_elements::ToFieldElements;
 use crate::proofs::transaction::Check;
 
-use crate::proofs::zkapp_logic;
 use crate::scan_state::currency::{self, SlotSpan};
+use crate::zkapps::zkapp_logic;
 
 use crate::scan_state::transaction_logic::zkapp_command::{
     self, CheckAuthorizationResult, SetOrKeep,

ledger/src/zkapps/mod.rs

@@ -3,3 +3,4 @@
 pub mod intefaces;
 pub mod non_snark;
 pub mod snark;
+pub mod zkapp_logic;

ledger/src/zkapps/snark.rs

@@ -21,7 +21,6 @@ use crate::{
         },
         witness::Witness,
         zkapp::{GlobalStateForProof, LedgerWithHash, WithStackHash, ZkappSingleData},
-        zkapp_logic,
     },
     scan_state::{
         currency::{Amount, SlotSpan},
@@ -37,6 +36,7 @@ use crate::{
         },
     },
     sparse_ledger::SparseLedger,
+    zkapps::zkapp_logic,
     Account, AccountId, AuthRequired, AuthRequiredEncoded, Inputs, MyCow, ReceiptChainHash,
     ToInputs, TokenId, VerificationKey, ZkAppAccount,
 };

ledger/src/zkapps/zkapp_logic.rs

@@ -22,7 +22,7 @@ use crate::{
 };
 use ark_ff::{One, Zero};
 
-use super::{
+use crate::proofs::{
     field::{Boolean, ToBoolean},
     zkapp::{StartDataSkeleton, ZkappSingleData},
 };
@@ -40,11 +40,11 @@ enum PerformResult<Z: ZkappApplication> {
 }
 
 struct GetNextAccountUpdateResult<Z: ZkappApplication> {
-    pub account_update: Z::AccountUpdate,
-    pub caller_id: TokenId,
-    pub account_update_forest: Z::CallForest,
-    pub new_call_stack: Z::CallStack,
-    pub new_frame: Z::StackFrame,
+    account_update: Z::AccountUpdate,
+    caller_id: TokenId,
+    account_update_forest: Z::CallForest,
+    new_call_stack: Z::CallStack,
+    new_frame: Z::StackFrame,
 }
 
 fn assert_<Z: ZkappApplication>(_b: Z::Bool) -> Result<(), String> {