fix order of fn def, test nit

Author: jackcmay

src/system_program.rs

@@ -217,11 +217,11 @@ mod test {
     #[test]
     fn test_load_call() {
         // first load the program
-        let program_id = Pubkey::default(); // same program id for both
         let loaded_programs = RwLock::new(HashMap::new());
         {
             let from = Keypair::new();
             let mut accounts = vec![Account::default()];
+            let program_id = Pubkey::default(); // same program id for both
             let tx = Transaction::system_load(
                 &from,
                 Hash::default(),
@@ -234,6 +234,7 @@ mod test {
         }
         // then call the program
         {
+            let program_id = Pubkey::default(); // same program id for both
             let keys = vec![Pubkey::default(), Pubkey::default()];
             let mut accounts = vec![Account::default(), Account::default()];
             accounts[0].tokens = 100;

src/transaction.rs

@@ -195,24 +195,6 @@ impl Transaction {
             fee,
         )
     }
-    /// Create and sign new SystemProgram::Load transaction
-    pub fn system_load(
-        from_keypair: &Keypair,
-        last_id: Hash,
-        fee: i64,
-        program_id: Pubkey,
-        name: String,
-    ) -> Self {
-        let load = SystemProgram::Load { program_id, name };
-        Transaction::new_with_userdata(
-            from_keypair,
-            &[],
-            SystemProgram::id(),
-            serialize(&load).unwrap(),
-            last_id,
-            fee,
-        )
-    }
     /// Create and sign new SystemProgram::CreateAccount transaction
     pub fn system_assign(
         from_keypair: &Keypair,
@@ -252,6 +234,24 @@ impl Transaction {
             fee,
         )
     }
+    /// Create and sign new SystemProgram::Load transaction
+    pub fn system_load(
+        from_keypair: &Keypair,
+        last_id: Hash,
+        fee: i64,
+        program_id: Pubkey,
+        name: String,
+    ) -> Self {
+        let load = SystemProgram::Load { program_id, name };
+        Transaction::new_with_userdata(
+            from_keypair,
+            &[],
+            SystemProgram::id(),
+            serialize(&load).unwrap(),
+            last_id,
+            fee,
+        )
+    }
     /// Create and sign new SystemProgram::Move transaction
     pub fn new(from_keypair: &Keypair, to: Pubkey, tokens: i64, last_id: Hash) -> Self {
         Transaction::system_move(from_keypair, to, tokens, last_id, 0)