Skip to content

chore: Normalize use of version in TopologySnapshot #10736

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
Bownairo merged 1 commit into from
Jul 13, 2026
+8 −8
Merged

chore: Normalize use of version in TopologySnapshot #10736

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
14 changes: 7 additions & 7 deletions rs/tests/driver/src/driver/test_env_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ impl TopologySnapshot {
}

pub fn subnets(&self) -> Box<dyn Iterator<Item = SubnetSnapshot>> {
let registry_version = self.local_registry.get_latest_version();
let registry_version = self.registry_version;
Box::new(
self.local_registry
.get_subnet_ids(registry_version)
Expand All @@ -418,15 +418,15 @@ impl TopologySnapshot {
}

pub fn subnet_canister_ranges(&self, sub: SubnetId) -> Vec<CanisterIdRange> {
let registry_version = self.local_registry.get_latest_version();
let registry_version = self.registry_version;
self.local_registry
.get_subnet_canister_ranges(registry_version, sub)
.expect("Could not deserialize optional routing table from local registry.")
.expect("Optional routing table is None in local registry.")
}

pub fn unassigned_nodes(&self) -> Box<dyn Iterator<Item = IcNodeSnapshot>> {
let registry_version = self.local_registry.get_latest_version();
let registry_version = self.registry_version;
let assigned_nodes: HashSet<_> = self
.local_registry
.get_subnet_ids(registry_version)
Expand Down Expand Up @@ -468,7 +468,7 @@ impl TopologySnapshot {
}

pub fn api_boundary_nodes(&self) -> Box<dyn Iterator<Item = IcNodeSnapshot>> {
let registry_version = self.local_registry.get_latest_version();
let registry_version = self.registry_version;

Box::new(
self.local_registry
Expand All @@ -488,7 +488,7 @@ impl TopologySnapshot {
}

pub fn system_api_boundary_nodes(&self) -> Box<dyn Iterator<Item = IcNodeSnapshot>> {
let registry_version = self.local_registry.get_latest_version();
let registry_version = self.registry_version;

Box::new(
self.local_registry
Expand All @@ -508,7 +508,7 @@ impl TopologySnapshot {
}

pub fn app_api_boundary_nodes(&self) -> Box<dyn Iterator<Item = IcNodeSnapshot>> {
let registry_version = self.local_registry.get_latest_version();
let registry_version = self.registry_version;

Box::new(
self.local_registry
Expand All @@ -528,7 +528,7 @@ impl TopologySnapshot {
}

pub fn replica_version_records(&self) -> Result<Vec<(String, ReplicaVersionRecord)>> {
let registry_version = self.local_registry.get_latest_version();
let registry_version = self.registry_version;

self.local_registry
.get_all_replica_version_records(registry_version)?
Expand Down
2 changes: 1 addition & 1 deletion rs/tests/nns/node_swap_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ fn test(env: TestEnv) {
.await
.unwrap();

topology_snapshot
let topology_snapshot = topology_snapshot
.block_for_newer_registry_version()
.await
.unwrap();
Expand Down
Loading