Add pathfinder trait

Author: sangbida

sim-cli/src/main.rs

@@ -12,6 +12,9 @@ use simln_lib::{
 use simple_logger::SimpleLogger;
 use tokio_util::task::TaskTracker;
 
+// Import the pathfinder types
+use simln_lib::sim_node::DefaultPathFinder;
+
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     // Enable tracing if building in developer mode.
@@ -33,6 +36,9 @@ async fn main() -> anyhow::Result<()> {
     cli.validate(&sim_params)?;
 
     let tasks = TaskTracker::new();
+    
+    // Create the pathfinder instance
+    let pathfinder = DefaultPathFinder;
 
     let (sim, validated_activities) = if sim_params.sim_network.is_empty() {
         create_simulation(&cli, &sim_params, tasks.clone()).await?
@@ -51,6 +57,7 @@ async fn main() -> anyhow::Result<()> {
             clock,
             tasks.clone(),
             interceptors,
+            pathfinder,
             CustomRecords::default(),
         )
         .await?;
@@ -66,4 +73,4 @@ async fn main() -> anyhow::Result<()> {
     sim.run(&validated_activities).await?;
 
     Ok(())
-}
+} 

sim-cli/src/parsing.rs

@@ -5,9 +5,15 @@ use log::LevelFilter;
 use serde::{Deserialize, Serialize};
 use simln_lib::clock::SimulationClock;
 use simln_lib::sim_node::{
+<<<<<<< HEAD
     ln_node_from_graph, populate_network_graph, ChannelPolicy, CustomRecords, Interceptor,
     SimGraph, SimNode, SimulatedChannel,
+=======
+    ln_node_from_graph, populate_network_graph, ChannelPolicy, CustomRecords, Interceptor, PathFinder,
+    SimGraph, SimulatedChannel,
+>>>>>>> 59dbbe6 (Add pathfinder trait)
 };
+
 use simln_lib::{
     cln, cln::ClnNode, eclair, eclair::EclairNode, lnd, lnd::LndNode, serializers,
     ActivityDefinition, Amount, Interval, LightningError, LightningNode, NodeId, NodeInfo,
@@ -241,6 +247,7 @@ struct NodeMapping {
     alias_node_map: HashMap<String, NodeInfo>,
 }
 
+<<<<<<< HEAD
 /// Creates a simulation that will run on an entirely-simulated network defined in `sim_params`,
 /// returning the simulation, a validated vector of any defined activities that were specified and
 /// a map of all the simulated nodes in the network. Note that if `sim_params::exclude` was set,
@@ -253,11 +260,16 @@ struct NodeMapping {
 /// records set by the original sender of payments in their simulated `update_add_htlc`.
 pub async fn create_simulation_with_network(
     cfg: SimulationCfg,
+=======
+pub async fn create_simulation_with_network<P: for<'a> PathFinder<'a> + Clone + 'static>(
+    cli: &Cli,
+>>>>>>> 59dbbe6 (Add pathfinder trait)
     sim_params: &SimParams,
     clock: Arc<SimulationClock>,
     tasks: TaskTracker,
     interceptors: Vec<Arc<dyn Interceptor>>,
     custom_records: CustomRecords,
+<<<<<<< HEAD
 ) -> Result<
     (
         Simulation<SimulationClock>,
@@ -266,6 +278,11 @@ pub async fn create_simulation_with_network(
     ),
     anyhow::Error,
 > {
+=======
+    pathfinder: P,
+) -> Result<(Simulation<SimulationClock>, Vec<ActivityDefinition>), anyhow::Error> {
+    let cfg: SimulationCfg = SimulationCfg::try_from(cli)?;
+>>>>>>> 59dbbe6 (Add pathfinder trait)
     let SimParams {
         nodes: _,
         sim_network,
@@ -309,6 +326,7 @@ pub async fn create_simulation_with_network(
             .map_err(|e| SimulationError::SimulatedNetworkError(format!("{:?}", e)))?,
     );
 
+<<<<<<< HEAD
     // We want the full set of nodes in our graph to return to the caller so that they can take
     // 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
@@ -322,6 +340,10 @@ pub async fn create_simulation_with_network(
         nodes_dyn.remove(pk);
     }
 
+=======
+    // Pass the pathfinder to ln_node_from_graph
+    let nodes = ln_node_from_graph(simulation_graph.clone(), routing_graph, pathfinder).await;
+>>>>>>> 59dbbe6 (Add pathfinder trait)
     let validated_activities =
         get_validated_activities(&nodes_dyn, nodes_info, sim_params.activity.clone()).await?;
 
@@ -339,6 +361,7 @@ pub async fn create_simulation_with_network(
     ))
 }
 
+
 /// Parses the cli options provided and creates a simulation to be run, connecting to lightning nodes and validating
 /// any activity described in the simulation file.
 pub async fn create_simulation(