Skip to content

Renaming work sequence to work id for dependency tracking #7250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lijunwangs merged 1 commit into from
Aug 27, 2025
Merged

Renaming work sequence to work id for dependency tracking #7250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions rpc/src/optimistically_confirmed_bank_tracker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ impl std::fmt::Debug for BankNotification {
}
}

pub type BankNotificationWithEventSequence = (
pub type BankNotificationWithDependencyWork = (
BankNotification,
Option<u64>, // dependecy work sequence number
Option<u64>, // dependecy work id
);

pub type BankNotificationReceiver = Receiver<BankNotificationWithEventSequence>;
pub type BankNotificationSender = Sender<BankNotificationWithEventSequence>;
pub type BankNotificationReceiver = Receiver<BankNotificationWithDependencyWork>;
pub type BankNotificationSender = Sender<BankNotificationWithDependencyWork>;

#[derive(Clone)]
pub struct BankNotificationSenderConfig {
Expand Down Expand Up @@ -138,7 +138,7 @@ impl OptimisticallyConfirmedBankTracker {

#[allow(clippy::too_many_arguments)]
fn recv_notification(
receiver: &Receiver<BankNotificationWithEventSequence>,
receiver: &Receiver<BankNotificationWithDependencyWork>,
bank_forks: &RwLock<BankForks>,
optimistically_confirmed_bank: &RwLock<OptimisticallyConfirmedBank>,
subscriptions: &RpcSubscriptions,
Expand Down Expand Up @@ -270,7 +270,7 @@ impl OptimisticallyConfirmedBankTracker {

#[allow(clippy::too_many_arguments)]
pub fn process_notification(
(notification, dependency_work): BankNotificationWithEventSequence,
(notification, dependency_work): BankNotificationWithDependencyWork,
bank_forks: &RwLock<BankForks>,
optimistically_confirmed_bank: &RwLock<OptimisticallyConfirmedBank>,
subscriptions: &RpcSubscriptions,
Expand Down Expand Up @@ -469,7 +469,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(2),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -489,7 +489,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(1),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -509,7 +509,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -534,7 +534,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::Frozen(bank3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -558,7 +558,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(4),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down Expand Up @@ -591,7 +591,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::NewRootBank(bank5),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -614,7 +614,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::NewRootedChain(parent_roots),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down Expand Up @@ -645,7 +645,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(6),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -670,7 +670,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::NewRootBank(bank7),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -692,7 +692,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::NewRootedChain(parent_roots),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -718,8 +718,8 @@ mod tests {
let exit = Arc::new(AtomicBool::new(false));
let dependency_tracker: Arc<DependencyTracker> =
Arc::new(dependency_tracker::DependencyTracker::default());
let work_sequence_1 = 345;
let work_sequence_2 = 678;
let work_id_1 = 345;
let work_id_2 = 678;
let tracker_clone = dependency_tracker.clone();
let handle = thread::spawn(move || {
let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(100);
Expand Down Expand Up @@ -756,7 +756,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(1),
Some(work_sequence_1), /* dependency work sequence */
Some(work_id_1), /* dependency work id */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -781,7 +781,7 @@ mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::Frozen(bank1),
Some(work_sequence_2), /* dependency work sequence */
Some(work_id_2), /* dependency work id */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -800,8 +800,8 @@ mod tests {
assert_eq!(pending_optimistically_confirmed_banks.len(), 0);
});

dependency_tracker.mark_this_and_all_previous_work_processed(work_sequence_1);
dependency_tracker.mark_this_and_all_previous_work_processed(work_sequence_2);
dependency_tracker.mark_this_and_all_previous_work_processed(work_id_1);
dependency_tracker.mark_this_and_all_previous_work_processed(work_id_2);

handle.join().unwrap();
}
Expand Down
8 changes: 4 additions & 4 deletions rpc/src/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8809,7 +8809,7 @@ pub mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(2),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -8833,7 +8833,7 @@ pub mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(1),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -8857,7 +8857,7 @@ pub mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand All @@ -8882,7 +8882,7 @@ pub mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::Frozen(bank3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down
14 changes: 7 additions & 7 deletions rpc/src/rpc_subscriptions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1992,7 +1992,7 @@ pub(crate) mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down Expand Up @@ -2049,7 +2049,7 @@ pub(crate) mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::Frozen(bank3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down Expand Up @@ -2172,7 +2172,7 @@ pub(crate) mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down Expand Up @@ -2291,7 +2291,7 @@ pub(crate) mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down Expand Up @@ -2350,7 +2350,7 @@ pub(crate) mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::Frozen(bank3),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down Expand Up @@ -2800,7 +2800,7 @@ pub(crate) mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::OptimisticallyConfirmed(1),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down Expand Up @@ -2859,7 +2859,7 @@ pub(crate) mod tests {
OptimisticallyConfirmedBankTracker::process_notification(
(
BankNotification::Frozen(bank2),
None, /* no work sequence */
None, /* no dependency work */
),
&bank_forks,
&optimistically_confirmed_bank,
Expand Down
12 changes: 6 additions & 6 deletions rpc/src/transaction_status_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ impl TransactionStatusService {
costs,
transaction_indexes,
},
work_sequence,
work_id,
)) => {
let mut status_and_memos_batch = blockstore.get_write_batch()?;

Expand Down Expand Up @@ -256,8 +256,8 @@ impl TransactionStatusService {
}

if let Some(dependency_tracker) = dependency_tracker.as_ref() {
if let Some(work_sequence) = work_sequence {
dependency_tracker.mark_this_and_all_previous_work_processed(work_sequence);
if let Some(work_id) = work_id {
dependency_tracker.mark_this_and_all_previous_work_processed(work_id);
}
}
}
Expand Down Expand Up @@ -529,7 +529,7 @@ pub(crate) mod tests {
transaction_status_sender
.send(TransactionStatusMessage::Batch((
transaction_status_batch,
None, /* No work sequence */
None, /* No work id */
)))
.unwrap();

Expand Down Expand Up @@ -633,11 +633,11 @@ pub(crate) mod tests {
Some(dependency_tracker.clone()),
exit.clone(),
);
let work_sequence = 345;
let work_id = 345;
transaction_status_sender
.send(TransactionStatusMessage::Batch((
transaction_status_batch,
Some(work_sequence),
Some(work_id),
)))
.unwrap();
transaction_status_service.quiesce_and_join_for_tests(exit);
Expand Down
Loading
Loading