Remove scan_state/zkapp_logic.rs

This is now fully replaced by `zkapps/{non_snark.rs,zkapp_logic.rs}`

Author: sebastiencs

ledger/src/generators/zkapp_command.rs

@@ -33,7 +33,10 @@ use crate::{
             },
             Memo,
         },
-        zkapp_logic::{self, ZkAppCommandElt},
+    },
+    zkapps::{
+        non_snark::ZkappNonSnark,
+        zkapp_logic::{update_action_state, ZkAppCommandElt},
     },
     Account, AccountId, AuthRequired, BaseLedger, ControlTag, Mask, MutableFp, MyCowMut,
     Permissions, ReceiptChainHash, SetVerificationKey, TokenId, VerificationKeyWire, VotingFor,
@@ -907,11 +910,12 @@ fn gen_account_update_body_components<A, B, C, D>(
                 Some(ps) => ps.global_slot_since_genesis,
             };
 
-            let (action_state, _last_action_slot) = zkapp_logic::update_action_state(
-                zk.action_state,
-                actions.clone(),
+            let (action_state, _last_action_slot) = update_action_state::<ZkappNonSnark<Mask>>(
+                &zk.action_state,
+                &actions,
                 txn_global_slot,
                 last_action_slot,
+                &mut (),
             );
 
             action_state

ledger/src/scan_state/mod.rs

@@ -9,7 +9,6 @@ pub mod protocol_state;
 pub mod scan_state;
 pub mod snark_work;
 pub mod transaction_logic;
-pub mod zkapp_logic;
 pub use parallel_scan::SpacePartition;
 
 pub struct GenesisConstant {

ledger/src/scan_state/transaction_logic.rs

@@ -41,12 +41,12 @@ use self::{
 
 use super::currency::SlotSpan;
 use super::fee_rate::FeeRate;
-use super::zkapp_logic::ZkAppCommandElt;
 use super::{
     currency::{Amount, Balance, Fee, Index, Length, Magnitude, Nonce, Signed, Slot},
     fee_excess::FeeExcess,
     scan_state::transaction_snark::OneOrTwo,
 };
+use crate::zkapps::zkapp_logic::ZkAppCommandElt;
 
 /// https://github.com/MinaProtocol/mina/blob/2ee6e004ba8c6a0541056076aab22ea162f7eb3a/src/lib/mina_base/transaction_status.ml#L9
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]