remove solana-program

anza-xyz · Dec 4, 2024 · f4d5b35 · f4d5b35
1 parent 7d9761f
commit f4d5b35
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 18 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-transaction/Cargo.toml b/svm-transaction/Cargo.toml
@@ -11,12 +11,14 @@ edition = { workspace = true }
 
 [dependencies]
 solana-hash = { workspace = true }
-solana-program = { workspace = true, default-features = false }
+solana-message = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-signature = { workspace = true }
 solana-transaction = { workspace = true }
 
 [dev-dependencies]
+solana-message = { workspace = true, features = ["bincode"] }
 solana-nonce = { workspace = true }
+solana-system-interface = { workspace = true }
 static_assertions = { workspace = true }
diff --git a/svm-transaction/src/instruction.rs b/svm-transaction/src/instruction.rs
@@ -1,4 +1,4 @@
-use solana_program::instruction::CompiledInstruction;
+use solana_message::compiled_instruction::CompiledInstruction;
 
 /// A non-owning version of [`CompiledInstruction`] that references
 /// slices of account indexes and data.

diff --git a/svm-transaction/src/message_address_table_lookup.rs b/svm-transaction/src/message_address_table_lookup.rs
@@ -1,4 +1,4 @@
-use {solana_program::message::v0, solana_pubkey::Pubkey};
+use {solana_message::v0, solana_pubkey::Pubkey};
 
 /// A non-owning version of [`v0::MessageAddressTableLookup`].
 /// This simply references the data in the original message.

diff --git a/svm-transaction/src/svm_message.rs b/svm-transaction/src/svm_message.rs
@@ -4,7 +4,7 @@ use {
     },
     core::fmt::Debug,
     solana_hash::Hash,
-    solana_program::message::AccountKeys,
+    solana_message::AccountKeys,
     solana_pubkey::Pubkey,
     solana_sdk_ids::system_program,
 };

diff --git a/svm-transaction/src/svm_message/sanitized_message.rs b/svm-transaction/src/svm_message/sanitized_message.rs
@@ -4,7 +4,7 @@ use {
         svm_message::SVMMessage,
     },
     solana_hash::Hash,
-    solana_program::message::{AccountKeys, SanitizedMessage},
+    solana_message::{AccountKeys, SanitizedMessage},
     solana_pubkey::Pubkey,
 };
 

diff --git a/svm-transaction/src/svm_message/sanitized_transaction.rs b/svm-transaction/src/svm_message/sanitized_transaction.rs
@@ -4,7 +4,7 @@ use {
         svm_message::SVMMessage,
     },
     solana_hash::Hash,
-    solana_program::message::AccountKeys,
+    solana_message::AccountKeys,
     solana_pubkey::Pubkey,
     solana_transaction::sanitized::SanitizedTransaction,
 };

diff --git a/svm-transaction/src/tests.rs b/svm-transaction/src/tests.rs
@@ -2,18 +2,16 @@
 use {
     crate::svm_message::SVMMessage,
     solana_hash::Hash,
-    solana_program::{
-        instruction::CompiledInstruction,
-        message::{
-            legacy,
-            v0::{self, LoadedAddresses, MessageAddressTableLookup},
-            MessageHeader, SanitizedMessage, SanitizedVersionedMessage, SimpleAddressLoader,
-            VersionedMessage,
-        },
-        system_instruction::SystemInstruction,
+    solana_message::{
+        compiled_instruction::CompiledInstruction,
+        legacy,
+        v0::{self, LoadedAddresses, MessageAddressTableLookup},
+        MessageHeader, SanitizedMessage, SanitizedVersionedMessage, SimpleAddressLoader,
+        VersionedMessage,
     },
     solana_pubkey::Pubkey,
     solana_sdk_ids::system_program,
+    solana_system_interface::instruction::SystemInstruction,
     std::collections::HashSet,
 };
 

diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock