feat: accept impl Into<VersionedTransaction> for ergonomics

OliverNChalk · Oct 9, 2024 · 43b7698 · 43b7698
1 parent 0c88ecb
commit 43b7698
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/crates/svm-test/src/svm.rs b/crates/svm-test/src/svm.rs
@@ -121,10 +121,10 @@ where
     #[allow(clippy::result_large_err)]
     pub fn simulate_transaction(
         &mut self,
-        tx: VersionedTransaction,
+        tx: impl Into<VersionedTransaction>,
     ) -> Result<(TransactionMetadata, Vec<(Pubkey, AccountSharedData)>), FailedTransactionMetadata>
     {
-        let tx = self.sanitize_and_load_accounts(tx);
+        let tx = self.sanitize_and_load_accounts(tx.into());
 
         self.inner
             .simulate_transaction(tx.to_versioned_transaction())
@@ -133,9 +133,9 @@ where
     #[allow(clippy::result_large_err)]
     pub fn execute_transaction(
         &mut self,
-        tx: VersionedTransaction,
+        tx: impl Into<VersionedTransaction>,
     ) -> Result<TransactionMetadata, FailedTransactionMetadata> {
-        let tx = self.sanitize_and_load_accounts(tx);
+        let tx = self.sanitize_and_load_accounts(tx.into());
 
         self.inner.send_transaction(tx.to_versioned_transaction())
     }

diff --git a/crates/svm-test/src/utils/mod.rs b/crates/svm-test/src/utils/mod.rs
@@ -2,7 +2,7 @@ mod load_elf;
 mod locate_manifest;
 mod pack_to_vec;
 mod read_json_gz;
-#[cfg(feature = "spl-token")]
+#[cfg(feature = "spl")]
 pub mod spl_token;
 mod test_payer;
 mod write_on_drop;

diff --git a/crates/svm-test/tests/program_unit_test.rs b/crates/svm-test/tests/program_unit_test.rs
@@ -29,7 +29,7 @@ fn memo() {
     );
 
     // Simulate (run without updating state).
-    let (meta, accounts) = svm.simulate_transaction(tx.into()).unwrap();
+    let (meta, accounts) = svm.simulate_transaction(tx).unwrap();
 
     // Assert.
     expect![[r#"