Remove unecessary imports

anza-xyz · Jun 17, 2024 · 99c52aa · 99c52aa
1 parent 10db617
commit 99c52aa
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 23 deletions.
diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml
@@ -28,8 +28,8 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-measure = { workspace = true }
 solana-metrics = { workspace = true }
 solana-sdk = { workspace = true }
-solana-vote = { workspace = true }
 solana-type-overrides = { workspace = true }
+solana-vote = { workspace = true }
 solana_rbpf = { workspace = true }
 thiserror = { workspace = true }
 

diff --git a/program-runtime/src/invoke_context.rs b/program-runtime/src/invoke_context.rs
@@ -36,8 +36,8 @@ use {
             IndexOfAccount, InstructionAccount, TransactionAccount, TransactionContext,
         },
     },
-    solana_vote::vote_account::VoteAccountsHashMap,
     solana_type_overrides::sync::{atomic::Ordering, Arc},
+    solana_vote::vote_account::VoteAccountsHashMap,
     std::{
         alloc::Layout,
         cell::RefCell,

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm/Cargo.toml b/svm/Cargo.toml
@@ -26,8 +26,8 @@ solana-metrics = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-sdk = { workspace = true }
 solana-system-program = { workspace = true }
-solana-vote = { workspace = true }
 solana-type-overrides = { workspace = true }
+solana-vote = { workspace = true }
 
 [lib]
 crate-type = ["lib"]

diff --git a/svm/src/transaction_processing_callback.rs b/svm/src/transaction_processing_callback.rs
@@ -1,8 +1,6 @@
 use {
     solana_program_runtime::loaded_programs::ProgramCacheMatchCriteria,
     solana_sdk::{account::AccountSharedData, pubkey::Pubkey},
-    solana_vote::vote_account::VoteAccountsHashMap,
-    solana_type_overrides::sync::Arc,
 };
 
 /// Runtime callbacks for transaction processing.

diff --git a/svm/src/transaction_processor.rs b/svm/src/transaction_processor.rs
@@ -54,8 +54,8 @@ use {
         transaction::{self, SanitizedTransaction, TransactionError},
         transaction_context::{ExecutionRecord, TransactionContext},
     },
-    solana_vote::vote_account::VoteAccountsHashMap,
     solana_type_overrides::sync::{atomic::Ordering, Arc, RwLock},
+    solana_vote::vote_account::VoteAccountsHashMap,
     std::{
         cell::RefCell,
         collections::{hash_map::Entry, HashMap, HashSet},
@@ -661,15 +661,6 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
                     &self.epoch_schedule,
                     false,
                 ) {
-<<<<<<< HEAD
-                    recompiled
-                        .tx_usage_counter
-                        .fetch_add(program_to_recompile.tx_usage_counter.load(Relaxed), Relaxed);
-                    recompiled
-                        .ix_usage_counter
-                        .fetch_add(program_to_recompile.ix_usage_counter.load(Relaxed), Relaxed);
-=======
-                    drop(program_cache_read);
                     recompiled.tx_usage_counter.fetch_add(
                         program_to_recompile
                             .tx_usage_counter
@@ -682,7 +673,6 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
                             .load(Ordering::Relaxed),
                         Ordering::Relaxed,
                     );
->>>>>>> 18f76f31f (Add shuttle test infrastructure)
                     let mut program_cache = self.program_cache.write().unwrap();
                     program_cache.assign_program(key, recompiled);
                 }

diff --git a/type-overrides/src/lib.rs b/type-overrides/src/lib.rs
@@ -28,11 +28,7 @@ pub mod lazy_static {
 }
 
 pub mod rand {
-    pub use rand::{
-        distributions::*, random, rngs::*, seq::*, CryptoRng, Error, Fill, SeedableRng,
-    };
-    #[cfg(not(feature = "shuttle-test"))]
-    pub use rand::{thread_rng, Rng, RngCore};
+    pub use rand::*;
     #[cfg(feature = "shuttle-test")]
     pub use shuttle::rand::{thread_rng, Rng, RngCore};
 }