Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove unnecessary type #29473

Merged
merged 1 commit into from
Jan 3, 2023
Merged

remove unnecessary type #29473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runtime/src/account_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub type Offset = usize;
pub type StoredSize = u32;

/// specify where account data is located
#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Eq)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem related to the other changes for removing the type annotation.

pub enum StorageLocation {
AppendVec(AppendVecId, Offset),
Cached,
Expand Down
6 changes: 3 additions & 3 deletions runtime/src/accounts_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4894,7 +4894,7 @@ impl AccountsDb {
// If the slot is not in the cache, then all the account information must have
// been flushed. This is guaranteed because we only remove the rooted slot from
// the cache *after* we've finished flushing in `flush_slot_cache`.
let storage_maps: SnapshotStorage = self
let storage_maps = self
.storage
.get_slot_storage_entries(slot)
.unwrap_or_default();
Expand Down Expand Up @@ -8125,7 +8125,7 @@ impl AccountsDb {
pubkeys_removed_from_accounts_index: &PubkeysRemovedFromAccountsIndex,
) {
let mut measure = Measure::start("clean_stored_dead_slots-ms");
let mut stores: SnapshotStorage = vec![];
let mut stores = vec![];
// get all stores in a vec so we can iterate in parallel
for slot in dead_slots.iter() {
if let Some(slot_storage) = self.storage.get_slot_stores(*slot) {
Expand Down Expand Up @@ -8873,7 +8873,7 @@ impl AccountsDb {
.take(per_pass)
.collect::<Vec<_>>();
roots_in_this_pass.into_par_iter().for_each(|slot| {
let storage_maps: SnapshotStorage = self
let storage_maps = self
.storage
.get_slot_storage_entries(*slot)
.unwrap_or_default();
Expand Down