use loader-instruction crate in transaction-status

anza-xyz · Jan 16, 2025 · f35686a · f35686a
1 parent adaae45
commit f35686a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock
diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml
@@ -24,6 +24,7 @@ solana-account-decoder = { workspace = true }
 solana-clock = { workspace = true }
 solana-hash = { workspace = true }
 solana-instruction = { workspace = true }
+solana-loader-instruction = { workspace = true, features = ["bincode"] }
 solana-message = { workspace = true }
 solana-program = { workspace = true }
 solana-pubkey = { workspace = true }

diff --git a/transaction-status/src/parse_bpf_loader.rs b/transaction-status/src/parse_bpf_loader.rs
@@ -5,11 +5,9 @@ use {
     base64::{prelude::BASE64_STANDARD, Engine},
     bincode::deserialize,
     serde_json::json,
+    solana_loader_instruction::LoaderInstruction,
     solana_message::{compiled_instruction::CompiledInstruction, AccountKeys},
-    solana_program::{
-        loader_instruction::LoaderInstruction,
-        loader_upgradeable_instruction::UpgradeableLoaderInstruction,
-    },
+    solana_program::loader_upgradeable_instruction::UpgradeableLoaderInstruction,
 };
 
 pub fn parse_bpf_loader(
@@ -224,12 +222,8 @@ mod test {
         let account_keys = vec![fee_payer, account_pubkey];
         let missing_account_keys = vec![account_pubkey];
 
-        let instruction = solana_program::loader_instruction::write(
-            &account_pubkey,
-            &program_id,
-            offset,
-            bytes.clone(),
-        );
+        let instruction =
+            solana_loader_instruction::write(&account_pubkey, &program_id, offset, bytes.clone());
         let mut message = Message::new(&[instruction], Some(&fee_payer));
         assert_eq!(
             parse_bpf_loader(
@@ -258,8 +252,7 @@ mod test {
         )
         .is_err());
 
-        let instruction =
-            solana_program::loader_instruction::finalize(&account_pubkey, &program_id);
+        let instruction = solana_loader_instruction::finalize(&account_pubkey, &program_id);
         let mut message = Message::new(&[instruction], Some(&fee_payer));
         assert_eq!(
             parse_bpf_loader(