Fix formatting

Author: sangbida

sim-cli/src/parsing.rs

@@ -5,13 +5,8 @@ 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)
+    PathFinder, SimGraph, SimulatedChannel,
 };
 
 use simln_lib::{
@@ -247,29 +242,15 @@ 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,
-/// the nodes will be excluded from the set of nodes actively sending/receiving random payments,
-/// but they will be included in the map so that they are available for use outside of the
-/// simulation.
-///
-/// This network can be customized by providing `interceptors` that will act on every HTLC that is
-/// forwarded by the network, and setting `custom_records` which will be set as the default TLV
-/// 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>(
+pub async fn create_simulation_with_network<P: PathFinder + 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
+<<<<<<< HEAD
 ) -> Result<
     (
         Simulation<SimulationClock>,
@@ -279,10 +260,11 @@ pub async fn create_simulation_with_network<P: for<'a> PathFinder<'a> + Clone +
     anyhow::Error,
 > {
 =======
+=======
+>>>>>>> 079041b (Fix formatting)
     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,
@@ -326,6 +308,7 @@ pub async fn create_simulation_with_network<P: for<'a> PathFinder<'a> + Clone +
             .map_err(|e| SimulationError::SimulatedNetworkError(format!("{:?}", e)))?,
     );
 
+<<<<<<< HEAD
 <<<<<<< 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
@@ -341,9 +324,10 @@ pub async fn create_simulation_with_network<P: for<'a> PathFinder<'a> + Clone +
     }
 
 =======
+=======
+>>>>>>> 079041b (Fix formatting)
     // 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?;