Merge branch 'master' into wen_restart_aggregate_last_voted_fork_slots

solana-labs · Feb 29, 2024 · 3adbea4 · 3adbea4
2 parents 0823cd8 + 9146236
commit 3adbea4
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -258,7 +258,6 @@ num-traits = "0.2"
 num_cpus = "1.16.0"
 num_enum = "0.7.2"
 openssl = "0.10"
-ouroboros = "0.15.6"
 parking_lot = "0.12"
 pbkdf2 = { version = "0.11.0", default-features = false }
 pem = "1.1.1"

diff --git a/accounts-db/Cargo.toml b/accounts-db/Cargo.toml
@@ -34,7 +34,6 @@ num-derive = { workspace = true }
 num-traits = { workspace = true }
 num_cpus = { workspace = true }
 num_enum = { workspace = true }
-ouroboros = { workspace = true }
 percentage = { workspace = true }
 qualifier_attr = { workspace = true }
 rand = { workspace = true }

diff --git a/accounts-db/src/in_mem_accounts_index.rs b/accounts-db/src/in_mem_accounts_index.rs
@@ -318,11 +318,6 @@ impl<T: IndexValue, U: DiskIndexValue + From<T> + Into<T>> InMemAccountsIndex<T,
         result
     }
 
-    /// lookup 'pubkey' in index (in mem or on disk)
-    pub fn get(&self, pubkey: &K) -> Option<AccountMapEntry<T>> {
-        self.get_internal(pubkey, |entry| (true, entry.map(Arc::clone)))
-    }
-
     /// set age of 'entry' to the future
     /// if 'is_cached', age will be set farther
     fn set_age_to_future(&self, entry: &AccountMapEntry<T>, is_cached: bool) {

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -38,7 +38,6 @@ num-derive = { workspace = true }
 num-traits = { workspace = true }
 num_cpus = { workspace = true }
 num_enum = { workspace = true }
-ouroboros = { workspace = true }
 percentage = { workspace = true }
 qualifier_attr = { workspace = true }
 rand = { workspace = true }