Skip to content

chore: [DSM-95] Clean up task_queue_compatibility_test, part 2 #9641

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
alin-at-dfinity merged 2 commits into from
Mar 31, 2026
Merged

chore: [DSM-95] Clean up task_queue_compatibility_test, part 2 #9641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efcf439
chore: [DSM-05] Clean up `task_queue_compatibility_test`, part 2
alin-at-dfinity Feb 24, 2026
95fc3b9
Merge branch 'master' into alin/DSM-95-cleanup-2
alin-at-dfinity Mar 30, 2026
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
9 changes: 0 additions & 9 deletions rs/replicated_state/src/canister_state/system_state/call_context_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,11 +928,6 @@ pub mod testing {

/// Testing only: Publicly exposes `unregister_callback()`.
fn unregister_callback(&mut self, callback_id: CallbackId) -> Option<Arc<Callback>>;

/// Testing only: Publicly exposes `next_callback_id`.
//
// TODO(DSM-95): Drop when no longer needed.
fn set_next_callback_id(&mut self, next_callback_id: u64);
}

impl CallContextManagerTesting for CallContextManager {
Expand All @@ -957,9 +952,5 @@ pub mod testing {
fn unregister_callback(&mut self, callback_id: CallbackId) -> Option<Arc<Callback>> {
self.unregister_callback(callback_id)
}

fn set_next_callback_id(&mut self, next_callback_id: u64) {
self.next_callback_id = next_callback_id;
}
}
}
15 changes: 1 addition & 14 deletions rs/state_layout/src/state_layout/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,27 +1304,14 @@ mod mainnet_compatibility_tests {
.expect("Failed to convert the protobuf to CanisterStateBits");

let CanisterStateBits {
task_queue,
mut status,
..
task_queue, status, ..
} = canister_state_bits;
let CanisterStateBits {
task_queue: expected_task_queue,
status: expected_status,
..
} = make_task_queue_and_status();

// Forward compatibility hack: the old version did not use `with_callback()`,
// so it was not bumping `next_callback_id`. Explicitly set it to 3.
//
// TODO(DSM-95): Drop in the release after the next.
if let CanisterStatus::Running {
call_context_manager,
} = &mut status
{
call_context_manager.set_next_callback_id(3);
}

assert_eq!(expected_task_queue, task_queue);
assert_eq!(expected_status, status);
}
Expand Down
Loading