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

Resolve nightly-2021-10-05 clippy complaints

Browse Source
This commit is contained in:
Michael Vines
2021-10-05 22:24:48 -07:00
parent eb4ce3dfed
commit 7027d56064
53 changed files with 229 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rpc/src/optimistically_confirmed_bank_tracker.rs
View File

@ -99,9 +99,9 @@ impl OptimisticallyConfirmedBankTracker {
bank_forks: &Arc<RwLock<BankForks>>,
optimistically_confirmed_bank: &Arc<RwLock<OptimisticallyConfirmedBank>>,
subscriptions: &Arc<RpcSubscriptions>,
mut pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
mut last_notified_confirmed_slot: &mut Slot,
mut highest_confirmed_slot: &mut Slot,
pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
last_notified_confirmed_slot: &mut Slot,
highest_confirmed_slot: &mut Slot,
bank_notification_subscribers: &Option<Arc<RwLock<Vec<BankNotificationSender>>>>,
) -> Result<(), RecvTimeoutError> {
let notification = receiver.recv_timeout(Duration::from_secs(1))?;
@ -110,9 +110,9 @@ impl OptimisticallyConfirmedBankTracker {
bank_forks,
optimistically_confirmed_bank,
subscriptions,
&mut pending_optimistically_confirmed_banks,
&mut last_notified_confirmed_slot,
&mut highest_confirmed_slot,
pending_optimistically_confirmed_banks,
last_notified_confirmed_slot,
highest_confirmed_slot,
bank_notification_subscribers,
);
Ok(())
@ -169,8 +169,8 @@ impl OptimisticallyConfirmedBankTracker {
bank_forks: &Arc<RwLock<BankForks>>,
bank: &Arc<Bank>,
slot_threshold: Slot,
mut last_notified_confirmed_slot: &mut Slot,
mut pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
last_notified_confirmed_slot: &mut Slot,
pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
bank_notification_subscribers: &Option<Arc<RwLock<Vec<BankNotificationSender>>>>,
) {
for confirmed_bank in bank.clone().parents_inclusive().iter().rev() {
@ -183,8 +183,8 @@ impl OptimisticallyConfirmedBankTracker {
subscriptions,
bank_forks,
confirmed_bank,
&mut last_notified_confirmed_slot,
&mut pending_optimistically_confirmed_banks,
last_notified_confirmed_slot,
pending_optimistically_confirmed_banks,
bank_notification_subscribers,
);
}
@ -196,8 +196,8 @@ impl OptimisticallyConfirmedBankTracker {
bank_forks: &Arc<RwLock<BankForks>>,
optimistically_confirmed_bank: &Arc<RwLock<OptimisticallyConfirmedBank>>,
subscriptions: &Arc<RpcSubscriptions>,
mut pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
mut last_notified_confirmed_slot: &mut Slot,
pending_optimistically_confirmed_banks: &mut HashSet<Slot>,
last_notified_confirmed_slot: &mut Slot,
highest_confirmed_slot: &mut Slot,
bank_notification_subscribers: &Option<Arc<RwLock<Vec<BankNotificationSender>>>>,
) {
@ -219,8 +219,8 @@ impl OptimisticallyConfirmedBankTracker {
bank_forks,
bank,
*highest_confirmed_slot,
&mut last_notified_confirmed_slot,
&mut pending_optimistically_confirmed_banks,
last_notified_confirmed_slot,
pending_optimistically_confirmed_banks,
bank_notification_subscribers,
);
@ -273,8 +273,8 @@ impl OptimisticallyConfirmedBankTracker {
bank_forks,
&bank,
*last_notified_confirmed_slot,
&mut last_notified_confirmed_slot,
&mut pending_optimistically_confirmed_banks,
last_notified_confirmed_slot,
pending_optimistically_confirmed_banks,
bank_notification_subscribers,
);

1
rpc/src/rpc.rs
View File

@ -155,6 +155,7 @@ pub struct JsonRpcRequestProcessor {
blockstore: Arc<Blockstore>,
config: JsonRpcConfig,
snapshot_config: Option<SnapshotConfig>,
#[allow(dead_code)]
validator_exit: Arc<RwLock<Exit>>,
health: Arc<RpcHealth>,
cluster_info: Arc<ClusterInfo>,

7
rpc/src/rpc_pubsub_service.rs
View File

@ -183,9 +183,10 @@ impl TestBroadcastReceiver {
}
}
Err(TryRecvError::Empty) => {
if started.elapsed() > timeout {
panic!("TestBroadcastReceiver: no data, timeout reached");
}
assert!(
started.elapsed() <= timeout,
"TestBroadcastReceiver: no data, timeout reached"
);
sleep(Duration::from_millis(50));
}
Err(err) => panic!("broadcast receiver error: {}", err),

6
rpc/src/rpc_subscriptions.rs
View File

@ -116,12 +116,6 @@ impl std::fmt::Debug for NotificationEntry {
}
}
#[derive(Default, Clone)]
struct ProgramConfig {
filters: Vec<RpcFilterType>,
encoding: Option<UiAccountEncoding>,
}
#[allow(clippy::type_complexity)]
fn check_commitment_and_notify<P, S, B, F, X>(
params: &P,