Resolve conflicts, adjust to the old rand API

Author: vadorovsky

accounts-db/Cargo.toml

@@ -54,7 +54,7 @@ modular-bitfield = { workspace = true }
 num_cpus = { workspace = true }
 num_enum = { workspace = true }
 qualifier_attr = { workspace = true, optional = true }
-rand = { workspace = true }
+rand = { workspace = true, features = ["small_rng"] }
 rayon = { workspace = true }
 seqlock = { workspace = true }
 serde = { workspace = true, features = ["rc"] }

accounts-db/src/read_only_accounts_cache.rs

@@ -2,19 +2,15 @@
 //! which can be large, loaded many times, and rarely change.
 #[cfg(feature = "dev-context-only-utils")]
 use qualifier_attr::{field_qualifiers, qualifiers};
+use rand::SeedableRng;
 use {
     ahash::random_state::RandomState as AHashRandomState,
     dashmap::{mapref::entry::Entry, DashMap},
     log::*,
     rand::{
-<<<<<<< HEAD
-        seq::{IteratorRandom, SliceRandom},
-        thread_rng, Rng,
-=======
         rngs::SmallRng,
-        seq::{IndexedRandom as _, IteratorRandom},
-        Rng, SeedableRng,
->>>>>>> 1ffcdcc60 (accounts-db: Use `SmallRng` for LRU eviction sampling (#10640))
+        seq::{IteratorRandom, SliceRandom},
+        Rng,
     },
     solana_account::{AccountSharedData, ReadableAccount},
     solana_clock::Slot,
@@ -293,11 +289,7 @@ impl ReadOnlyAccountsCache {
             .name("solAcctReadCache".to_string())
             .spawn(move || {
                 info!("AccountsReadCacheEvictor has started");
-<<<<<<< HEAD
-                let mut rng = thread_rng();
-=======
-                let mut rng = SmallRng::from_os_rng();
->>>>>>> 1ffcdcc60 (accounts-db: Use `SmallRng` for LRU eviction sampling (#10640))
+                let mut rng = SmallRng::from_entropy();
                 loop {
                     if exit.load(Ordering::Relaxed) {
                         break;