mint now uses the SystemContract instead of Budget

src/bank.rs

@@ -3,17 +3,17 @@
 //! on behalf of the caller, and a low-level API for when they have
 //! already been signed and verified.
 
+use bincode::deserialize;
 use bincode::serialize;
 use budget_contract::BudgetContract;
 use counter::Counter;
 use entry::Entry;
 use hash::{hash, Hash};
-use instruction::Instruction;
 use itertools::Itertools;
 use ledger::Block;
 use log::Level;
 use mint::Mint;
-use payment_plan::{Payment, PaymentPlan};
+use payment_plan::Payment;
 use signature::{Keypair, Pubkey, Signature};
 use std;
 use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
@@ -284,9 +284,12 @@ impl Bank {
             } else {
                 error_counters.account_not_found_leader += 1;
             }
+            if BudgetContract::check_id(&tx.contract_id) {
+                use instruction::Instruction;
                 if let Some(Instruction::NewVote(_vote)) = tx.instruction() {
                     error_counters.account_not_found_vote += 1;
                 }
+            }
             Err(BankError::AccountNotFound(*tx.from()))
         } else if accounts.get(&tx.keys[0]).unwrap().tokens < tx.fee {
             Err(BankError::InsufficientFundsForFee(*tx.from()))
@@ -557,17 +560,18 @@ impl Bank {
             .expect("invalid ledger: need at least 2 entries");
         {
             let tx = &entry1.transactions[0];
-            let instruction = tx.instruction();
+            assert!(SystemContract::check_id(&tx.contract_id), "Invalid ledger");
-            let deposit = if let Some(Instruction::NewContract(contract)) = instruction {
+            let instruction: SystemContract = deserialize(&tx.userdata).unwrap();
-                contract.plan.final_payment()
+            let deposit = if let SystemContract::Move { tokens } = instruction {
+                Some(tokens)
             } else {
                 None
             }.expect("invalid ledger, needs to start with a contract");
             {
                 let mut accounts = self.accounts.write().unwrap();
-                let entry = accounts.entry(tx.keys[0]).or_insert_with(Account::default);
+                let account = accounts.entry(tx.keys[0]).or_insert_with(Account::default);
-                Self::apply_payment(&deposit, entry);
+                account.tokens += deposit;
-                trace!("applied genesis payment {:?} {:?}", deposit, entry);
+                trace!("applied genesis payment {:?} => {:?}", deposit, account);
             }
         }
         self.register_entry_id(&entry0.id);

src/mint.rs

@@ -52,7 +52,7 @@ impl Mint {
 
     pub fn create_transactions(&self) -> Vec<Transaction> {
         let keypair = self.keypair();
-        let tx = Transaction::budget_new(&keypair, self.pubkey(), self.tokens, self.seed());
+        let tx = Transaction::system_move(&keypair, self.pubkey(), self.tokens, self.seed(), 0);
         vec![tx]
     }
 
@@ -66,18 +66,18 @@ impl Mint {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use budget::Budget;
+    use bincode::deserialize;
-    use instruction::{Instruction, Plan};
     use ledger::Block;
+    use system_contract::SystemContract;
 
     #[test]
     fn test_create_transactions() {
         let mut transactions = Mint::new(100).create_transactions().into_iter();
         let tx = transactions.next().unwrap();
-        if let Some(Instruction::NewContract(contract)) = tx.instruction() {
+        assert!(SystemContract::check_id(&tx.contract_id));
-            if let Plan::Budget(Budget::Pay(payment)) = contract.plan {
+        let instruction: SystemContract = deserialize(&tx.userdata).unwrap();
-                assert_eq!(*tx.from(), payment.to);
+        if let SystemContract::Move { tokens } = instruction {
-            }
+            assert_eq!(tokens, 100);
         }
         assert_eq!(transactions.next(), None);
     }