merge conflicts

solana-labs · Oct 6, 2020 · b0d76e1 · b0d76e1
1 parent c38b33c
commit b0d76e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
@@ -47,7 +47,7 @@ use std::{
     ops::RangeBounds,
     path::{Path, PathBuf},
     sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering},
-    sync::{Arc, Mutex, MutexGuard, RwLock, RwLockWriteGuard},
+    sync::{Arc, Mutex, MutexGuard, RwLock},
     time::Instant,
 };
 use tempfile::TempDir;
@@ -2071,7 +2071,7 @@ impl AccountsDB {
             let mut stores: Vec<Arc<AccountStorageEntry>> = vec![];
             for slot in dead_slots.iter() {
                 if let Some(slot_storage) = self.storage.get_slot_stores(*slot) {
-                    for store in slot_storage.values() {
+                    for store in slot_storage.read().unwrap().values() {
                         stores.push(store.clone());
                     }
                 }