fixup! sim-ln/feat: Track Clock in SimNode

Author: chuksys

sim-cli/src/parsing.rs

@@ -313,7 +313,7 @@ pub async fn create_simulation_with_network(
     // custom actions on the simulated network. For the nodes we'll pass our simulation, cast them
     // to a dyn trait and exclude any nodes that shouldn't be included in random activity
     // generation.
-    let nodes = ln_node_from_graph(simulation_graph.clone(), routing_graph).await?;
+    let nodes = ln_node_from_graph(simulation_graph.clone(), routing_graph, SystemClock {}).await?;
     let mut nodes_dyn: HashMap<_, Arc<Mutex<dyn LightningNode>>> = nodes
         .iter()
         .map(|(pk, node)| (*pk, Arc::clone(node) as Arc<Mutex<dyn LightningNode>>))

simln-lib/src/clock.rs

@@ -12,7 +12,7 @@ pub trait Clock: Send + Sync {
 }
 
 /// Provides a wall clock implementation of the Clock trait.
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 pub struct SystemClock {}
 
 #[async_trait]

simln-lib/src/sim_node.rs

@@ -1,4 +1,4 @@
-use crate::clock::{Clock, SystemClock};
+use crate::clock::Clock;
 use crate::{
     Graph, LightningError, LightningNode, NodeInfo, PaymentOutcome, PaymentResult, SimulationError,
 };
@@ -1061,11 +1061,12 @@ impl SimGraph {
 }
 
 /// Produces a map of node public key to lightning node implementation to be used for simulations.
-pub async fn ln_node_from_graph(
+pub async fn ln_node_from_graph<C: Clock + std::marker::Copy>(
     graph: Arc<Mutex<SimGraph>>,
     routing_graph: Arc<LdkNetworkGraph>,
-) -> Result<HashMap<PublicKey, Arc<Mutex<SimNode<SimGraph, SystemClock>>>>, LightningError> {
-    let mut nodes: HashMap<PublicKey, Arc<Mutex<SimNode<SimGraph, SystemClock>>>> = HashMap::new();
+    clock: C,
+) -> Result<HashMap<PublicKey, Arc<Mutex<SimNode<SimGraph, C>>>>, LightningError> {
+    let mut nodes: HashMap<PublicKey, Arc<Mutex<SimNode<SimGraph, C>>>> = HashMap::new();
 
     for node in graph.lock().await.nodes.iter() {
         nodes.insert(
@@ -1074,7 +1075,7 @@ pub async fn ln_node_from_graph(
                 node.1 .0.clone(),
                 graph.clone(),
                 routing_graph.clone(),
-                SystemClock {},
+                clock.clone(),
             )?)),
         );
     }