Fix rustfmt and clippy

dfinity · Jan 30, 2025 · 63d64b4 · 63d64b4
1 parent 611f1c5
commit 63d64b4
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/rs/pocket_ic_server/src/lib.rs b/rs/pocket_ic_server/src/lib.rs
@@ -38,8 +38,10 @@ pub mod pocket_ic;
 pub mod state_api;
 
 use crate::state_api::state::OpOut;
-use ::pocket_ic::common::rest::{BinaryBlob, BlobId};
+use ::pocket_ic::common::rest::{BinaryBlob, BlobId, RawSubnetBlockmakerMetrics};
 use axum::async_trait;
+use candid::Principal;
+use ic_types::{NodeId, PrincipalId, SubnetId};
 use pocket_ic::PocketIc;
 use serde::Deserialize;
 
@@ -91,3 +93,28 @@ pub fn copy_dir(
     }
     Ok(())
 }
+
+#[derive(Clone, Debug)]
+pub struct SubnetBlockmakerMetrics {
+    pub subnet: SubnetId,
+    pub blockmaker: NodeId,
+    pub failed_blockmakers: Vec<NodeId>,
+}
+
+impl From<RawSubnetBlockmakerMetrics> for SubnetBlockmakerMetrics {
+    fn from(raw: RawSubnetBlockmakerMetrics) -> Self {
+        let subnet = SubnetId::from(PrincipalId::from(Principal::from(raw.subnet)));
+        let blockmaker = NodeId::from(PrincipalId::from(Principal::from(raw.blockmaker)));
+        let failed_blockmakers: Vec<NodeId> = raw
+            .failed_blockmakers
+            .into_iter()
+            .map(|node_id| NodeId::from(PrincipalId::from(Principal::from(node_id))))
+            .collect();
+
+        SubnetBlockmakerMetrics {
+            subnet,
+            blockmaker,
+            failed_blockmakers,
+        }
+    }
+}
diff --git a/rs/pocket_ic_server/src/pocket_ic.rs b/rs/pocket_ic_server/src/pocket_ic.rs
@@ -1,5 +1,5 @@
 use crate::state_api::state::{HasStateLabel, OpOut, PocketIcError, StateLabel};
-use crate::{async_trait, copy_dir, BlobStore, OpId, Operation};
+use crate::{async_trait, copy_dir, BlobStore, OpId, Operation, SubnetBlockmakerMetrics};
 use askama::Template;
 use axum::{
     extract::State,
@@ -78,8 +78,7 @@ use pocket_ic::common::rest::{
     self, BinaryBlob, BlobCompression, CanisterHttpHeader, CanisterHttpMethod, CanisterHttpRequest,
     CanisterHttpResponse, ExtendedSubnetConfigSet, MockCanisterHttpResponse, RawAddCycles,
     RawCanisterCall, RawCanisterId, RawEffectivePrincipal, RawMessageId, RawSetStableMemory,
-    RawSubnetBlockmakerMetrics, SubnetInstructionConfig, SubnetKind, SubnetSpec, TickConfigs,
-    Topology,
+    SubnetInstructionConfig, SubnetKind, SubnetSpec, TickConfigs, Topology,
 };
 use pocket_ic::{ErrorCode, RejectCode, RejectResponse};
 use serde::{Deserialize, Serialize};
@@ -1632,8 +1631,7 @@ impl Operation for Tick {
             }
         }
 
-        let subnets = pic.subnets.subnets.read().unwrap();
-        for (_, subnet) in subnets.iter() {
+        for subnet in pic.subnets.get_all() {
             subnet.state_machine.execute_round();
         }
         OpOut::NoOutput
@@ -1644,31 +1642,6 @@ impl Operation for Tick {
     }
 }
 
-#[derive(Clone, Debug)]
-pub struct SubnetBlockmakerMetrics {
-    pub subnet: SubnetId,
-    pub blockmaker: NodeId,
-    pub failed_blockmakers: Vec<NodeId>,
-}
-
-impl From<RawSubnetBlockmakerMetrics> for SubnetBlockmakerMetrics {
-    fn from(raw: RawSubnetBlockmakerMetrics) -> Self {
-        let subnet = SubnetId::from(PrincipalId::from(Principal::from(raw.subnet)));
-        let blockmaker = NodeId::from(PrincipalId::from(Principal::from(raw.blockmaker)));
-        let failed_blockmakers: Vec<NodeId> = raw
-            .failed_blockmakers
-            .into_iter()
-            .map(|node_id| NodeId::from(PrincipalId::from(Principal::from(node_id))))
-            .collect();
-
-        SubnetBlockmakerMetrics {
-            subnet,
-            blockmaker,
-            failed_blockmakers,
-        }
-    }
-}
-
 #[derive(Copy, Clone, Debug)]
 pub struct AdvanceTimeAndTick(pub Duration);