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

Update to rust 1.40.0 (#7572)

Browse Source 
* Update to rust 1.40.0

* fixups
This commit is contained in:
Rob Walker
2019-12-19 23:27:54 -08:00
committed by GitHub
parent 2ebfab8e07
commit a7040896f0
33 changed files with 198 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/rpc.rs
View File

@ -95,7 +95,7 @@ impl JsonRpcRequestProcessor {
block_commitment_cache: Arc<RwLock<BlockCommitmentCache>>,
blocktree: Arc<Blocktree>,
storage_state: StorageState,
validator_exit: &Arc<RwLock<Option<ValidatorExit>>>,
validator_exit: Arc<RwLock<Option<ValidatorExit>>>,
) -> Self {
JsonRpcRequestProcessor {
config,
@ -103,7 +103,7 @@ impl JsonRpcRequestProcessor {
block_commitment_cache,
blocktree,
storage_state,
validator_exit: validator_exit.clone(),
validator_exit,
}
}
@ -1207,7 +1207,7 @@ pub mod tests {
block_commitment_cache.clone(),
blocktree,
StorageState::default(),
&validator_exit,
validator_exit,
)));
let cluster_info = Arc::new(RwLock::new(ClusterInfo::new_with_invalid_keypair(
ContactInfo::default(),
@ -1259,7 +1259,7 @@ pub mod tests {
block_commitment_cache,
Arc::new(blocktree),
StorageState::default(),
&validator_exit,
validator_exit,
);
thread::spawn(move || {
let blockhash = bank.confirmed_last_blockhash().0;
@ -1756,7 +1756,7 @@ pub mod tests {
block_commitment_cache,
Arc::new(blocktree),
StorageState::default(),
&validator_exit,
validator_exit,
);
Arc::new(RwLock::new(request_processor))
},
@ -1854,7 +1854,7 @@ pub mod tests {
block_commitment_cache,
Arc::new(blocktree),
StorageState::default(),
&validator_exit,
validator_exit,
);
assert_eq!(request_processor.validator_exit(), Ok(false));
assert_eq!(exit.load(Ordering::Relaxed), false);
@ -1875,7 +1875,7 @@ pub mod tests {
block_commitment_cache,
Arc::new(blocktree),
StorageState::default(),
&validator_exit,
validator_exit,
);
assert_eq!(request_processor.validator_exit(), Ok(true));
assert_eq!(exit.load(Ordering::Relaxed), true);
@ -1928,7 +1928,7 @@ pub mod tests {
block_commitment_cache,
Arc::new(blocktree),
StorageState::default(),
&validator_exit,
validator_exit,
);
assert_eq!(
request_processor.get_block_commitment(0),