Cleanup loader methods

src/utils/loader.rs

@@ -77,9 +77,9 @@ fn load_upgradeable_buffer(
 fn deploy_upgradeable_program(
     bank: &mut LiteSVM,
     payer_kp: &Keypair,
+    program_kp: &Keypair,
     program_bytes: &[u8],
-) -> Result<Pubkey, FailedTransactionMetadata> {
-    let program_kp = Keypair::new();
+) -> Result<(), FailedTransactionMetadata> {
     let program_pk = program_kp.pubkey();
     let payer_pk = payer_kp.pubkey();
     let buffer_pk = load_upgradeable_buffer(bank, payer_kp, program_bytes)?;
@@ -99,35 +99,20 @@ fn deploy_upgradeable_program(
     );
     bank.send_message(message, &[payer_kp, &program_kp])?;
 
-    Ok(program_pk)
-}
-
-pub trait Loader {
-    fn set_upgrade_authority(
-        &mut self,
-        from_keypair: &Keypair,
-        program_pubkey: &Pubkey,
-        current_authority_keypair: &Keypair,
-        new_authority_pubkey: Option<&Pubkey>,
-    ) -> Result<(), FailedTransactionMetadata>;
-
-    fn deploy_upgradeable_program(
-        &mut self,
-        payer_kp: &Keypair,
-        program_bytes: &[u8],
-    ) -> Result<Pubkey, FailedTransactionMetadata>;
+    Ok(())
 }
 
-impl Loader for LiteSVM {
-    fn deploy_upgradeable_program(
+impl LiteSVM {
+    pub fn deploy_upgradeable_program(
         &mut self,
         payer_kp: &Keypair,
+        program_kp: &Keypair,
         program_bytes: &[u8],
-    ) -> Result<Pubkey, FailedTransactionMetadata> {
-        deploy_upgradeable_program(self, payer_kp, program_bytes)
+    ) -> Result<(), FailedTransactionMetadata> {
+        deploy_upgradeable_program(self, payer_kp, program_kp, program_bytes)
     }
 
-    fn set_upgrade_authority(
+    pub fn set_upgrade_authority(
         &mut self,
         from_keypair: &Keypair,
         program_pubkey: &Pubkey,

src/utils/mod.rs

@@ -9,7 +9,6 @@ use solana_sdk::{
 mod loader;
 mod rent;
 
-pub use loader::*;
 pub(crate) use rent::*;
 
 /// Create a blockhash from the given bytes

tests/loaders.rs

@@ -1,4 +1,4 @@
-use litesvm::{LiteSVM, Loader};
+use litesvm::LiteSVM;
 use solana_program::{
     instruction::{AccountMeta, Instruction},
     message::Message,
@@ -48,9 +48,10 @@ fn hello_world_with_deploy_upgradeable() {
 
     bank.airdrop(&payer_pk, 10000000000).unwrap();
 
-    let program_id = bank
-        .deploy_upgradeable_program(&payer_kp, program_bytes)
+    let program_keypair = Keypair::new();
+    bank.deploy_upgradeable_program(&payer_kp, &program_keypair, program_bytes)
         .unwrap();
+    let program_id = program_keypair.pubkey();
     let instruction =
         Instruction::new_with_bytes(program_id, &[], vec![AccountMeta::new(payer_pk, true)]);
     let message = Message::new(&[instruction], Some(&payer_pk));