gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AcctIdx: handle future config defaults (#19967)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-09-17 13:12:06 -05:00
committed by GitHub
parent 0404e75e96
commit 99f5684dc4
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ledger-tool/src/main.rs
View File

@ -1908,12 +1908,12 @@ fn main() {
} }
} }
("verify", Some(arg_matches)) => { ("verify", Some(arg_matches)) => {
let accounts_index_config = value_t!(arg_matches, "accounts_index_bins", usize) let mut accounts_index_config = AccountsIndexConfig::default();
.ok() if let Some(bins) = value_t!(matches, "accounts_index_bins", usize).ok() {
.map(|bins| AccountsIndexConfig { bins: Some(bins) }); accounts_index_config.bins = Some(bins);
}
let accounts_db_config = Some(AccountsDbConfig { let accounts_db_config = Some(AccountsDbConfig {
index: accounts_index_config, index: Some(accounts_index_config),
accounts_hash_cache_path: Some(ledger_path.clone()), accounts_hash_cache_path: Some(ledger_path.clone()),
}); });

5
runtime/src/accounts_index.rs
View File

@ -4112,7 +4112,10 @@ pub mod tests {
#[test] #[test]
#[should_panic(expected = "bins.is_power_of_two()")] #[should_panic(expected = "bins.is_power_of_two()")]
#[allow(clippy::field_reassign_with_default)]
fn test_illegal_bins() { fn test_illegal_bins() {
AccountsIndex::<bool>::new(Some(AccountsIndexConfig { bins: Some(3) })); let mut config = AccountsIndexConfig::default();
config.bins = Some(3);
AccountsIndex::<bool>::new(Some(config));
} }
} }

9
validator/src/main.rs
View File

@ -2487,12 +2487,13 @@ pub fn main() {
_ => unreachable!(), _ => unreachable!(),
}; };
let accounts_index_config = value_t!(matches, "accounts_index_bins", usize) let mut accounts_index_config = AccountsIndexConfig::default();
.ok() if let Some(bins) = value_t!(matches, "accounts_index_bins", usize).ok() {
.map(|bins| AccountsIndexConfig { bins: Some(bins) }); accounts_index_config.bins = Some(bins);
}
let accounts_db_config = Some(AccountsDbConfig { let accounts_db_config = Some(AccountsDbConfig {
index: accounts_index_config, index: Some(accounts_index_config),
accounts_hash_cache_path: Some(ledger_path.clone()), accounts_hash_cache_path: Some(ledger_path.clone()),
}); });