From 226d7d986b57bbf6e1f829937f6a94bdc30aba4e Mon Sep 17 00:00:00 2001 From: steviez Date: Fri, 4 Aug 2023 12:03:22 -0600 Subject: [PATCH] Simplify root slot lookup from BankForks (#32717) No need to get an Arc when we want the root slot from BankForks; can just use BankForks::root(). --- core/src/validator.rs | 2 +- rpc/src/optimistically_confirmed_bank_tracker.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/validator.rs b/core/src/validator.rs index 89356cee1..8c9d0b048 100644 --- a/core/src/validator.rs +++ b/core/src/validator.rs @@ -1859,7 +1859,7 @@ impl<'a> ProcessBlockStore<'a> { if let Some(hard_fork_restart_slot) = maybe_cluster_restart_with_hard_fork( self.config, - self.bank_forks.read().unwrap().root_bank().slot(), + self.bank_forks.read().unwrap().root(), ) { // reconciliation attempt 2 of 2 with hard fork // this should be #2 because hard fork root > tower root in almost all cases diff --git a/rpc/src/optimistically_confirmed_bank_tracker.rs b/rpc/src/optimistically_confirmed_bank_tracker.rs index dacfcd9b3..e918ff3dd 100644 --- a/rpc/src/optimistically_confirmed_bank_tracker.rs +++ b/rpc/src/optimistically_confirmed_bank_tracker.rs @@ -188,7 +188,7 @@ impl OptimisticallyConfirmedBankTracker { SlotNotification::OptimisticallyConfirmed(bank.slot()), ); } - } else if bank.slot() > bank_forks.read().unwrap().root_bank().slot() { + } else if bank.slot() > bank_forks.read().unwrap().root() { pending_optimistically_confirmed_banks.insert(bank.slot()); debug!("notify_or_defer defer notifying for slot {:?}", bank.slot()); } @@ -287,7 +287,7 @@ impl OptimisticallyConfirmedBankTracker { *highest_confirmed_slot = slot; } drop(w_optimistically_confirmed_bank); - } else if slot > bank_forks.read().unwrap().root_bank().slot() { + } else if slot > bank_forks.read().unwrap().root() { pending_optimistically_confirmed_banks.insert(slot); } else { inc_new_counter_info!("dropped-already-rooted-optimistic-bank-notification", 1);