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

Maintenance : simplify a few patterns, remove unneeded dependencies (#8137)

Browse Source 
* Simplify a few pattern matches

* Removing unneeded dependencies, upgrading internal version #s

 net-shaper: Removing log, semver, serde_derive
 bench-tps: Removing serde, serde_derive
 banking-bench: Removing solana
 ledger-tool: Removing bincode, serde, serde_derive
 librapay: Removing solana, language_e2e_tests
 log-analyzer: Removing log, semver, serde_derive
 exchange: Removing solana
 core: Removing crc, memmap, symlink, untrusted
 perf: Removing serde_derive
 genesis: Removing hex, serde_derive
 sdk-c: Removing sha2
 sys-tuner: Removing semver
 bench-exchange: Removing bincode, bs58, env_logger, serde, serde_derive, untrusted, ws
 btc_spv_bin: Removing serde_json
 btc_spv: Removing chrono
 bpf_loader: Removing serde
 ledger: Removing dlopen, dlopen_derive, serde_derive
 move_loader: Removing byteorder, libc, language_e2e_tests
 ownable: Removing serde, serde_derive
 client: Removing rand
 archiver-utils: Removing rand_chacha
 validator: Removing serde_json, tempfile
 param_passing_dep: Removing solana
 failure: Removing log
 vest: Removing log
 vote-signer: Removing bs58, serde
 local-cluster: Removing symlink
 keygen: Removing rpassword
 install: Removing bs58, log
 upload-perf: Removing log
 runtime: Removing serde_json
 stake: Removing rand

* Add modified Cargo.lock

* fixup! Simplify a few pattern matches

* fixup! Simplify a few pattern matches
This commit is contained in:
François Garillot
2020-02-06 12:02:38 -05:00
committed by GitHub
parent 59ba1df910
commit f016c9a669
40 changed files with 53 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/Cargo.toml
View File

@ -22,7 +22,6 @@ rand = "0.6.5"
rayon = "1.2.0"
serde = { version = "1.0.104", features = ["rc"] }
serde_derive = "1.0.103"
serde_json = "1.0.46"
solana-logger = { path = "../logger", version = "0.24.0" }
solana-measure = { path = "../measure", version = "0.24.0" }
solana-metrics = { path = "../metrics", version = "0.24.0" }

7
runtime/src/accounts_index.rs
View File

@ -75,11 +75,8 @@ impl<T: Clone> AccountsIndex<T> {
) -> Option<(RwLockReadGuard<SlotList<T>>, usize)> {
self.account_maps.get(pubkey).and_then(|list| {
let lock = list.read().unwrap();
if let Some(found_index) = self.latest_slot(ancestors, &lock) {
Some((lock, found_index))
} else {
None
}
let found_index = self.latest_slot(ancestors, &lock)?;
Some((lock, found_index))
})
}

3
runtime/src/nonce_utils.rs
View File

@ -22,8 +22,7 @@ pub fn transaction_uses_durable_nonce(tx: &Transaction) -> Option<&CompiledInstr
Some(program_id) => system_program::check_id(&program_id),
_ => false,
}
})
.filter(|maybe_ix| match limited_deserialize(&maybe_ix.data) {
} && match limited_deserialize(&maybe_ix.data) {
Ok(SystemInstruction::AdvanceNonceAccount) => true,
_ => false,
})

3
runtime/src/status_cache.rs
View File

@ -87,8 +87,7 @@ impl<T: Serialize + Clone> StatusCache<T> {
if let Some(stored_forks) = sigmap.get(&sig_slice) {
let res = stored_forks
.iter()
.filter(|(f, _)| ancestors.get(f).is_some() || self.roots.get(f).is_some())
.nth(0)
.find(|(f, _)| ancestors.get(f).is_some() || self.roots.get(f).is_some())
.cloned();
if res.is_some() {
return res;