Fixup rebase

Author: sangbida

simln-lib/src/sim_node.rs

@@ -503,16 +503,15 @@ pub trait SimNetwork: Send + Sync {
 type LdkNetworkGraph = NetworkGraph<&'static WrappedLog>;
 /// A trait for custom pathfinding implementations.
 /// Finds a route from the source node to the destination node for the specified amount.
-/// 
+///
 /// # Arguments
 /// * `source` - The public key of the node initiating the payment.
 /// * `dest` - The public key of the destination node to receive the payment.
 /// * `amount_msat` - The amount to send in millisatoshis.
 /// * `pathfinding_graph` - The network graph containing channel topology and routing information.
-/// 
+///
 /// # Returns
 /// Returns a `Route` containing the payment path, or a `SimulationError` if no route is found.
-
 pub trait PathFinder: Send + Sync + Clone {
     fn find_route(
         &self,
@@ -664,37 +663,6 @@ impl<T: SimNetwork, C: Clock, P: PathFinder> SimNode<T, C, P> {
 
         Ok(())
     }
-
-    /// Dispatches a payment to a specified route.
-    /// The [`lightning::routing::router::build_route_from_hops`] function can be used to build the route to be passed here.
-    ///
-    /// **Note:** The payment hash passed in here should be used in track_payment to track the payment outcome.
-    pub async fn send_to_route(
-        &mut self,
-        route: Route,
-        payment_hash: PaymentHash,
-    ) -> Result<(), LightningError> {
-        let (sender, receiver) = channel();
-
-        // Check for payment hash collision, failing the payment if we happen to repeat one.
-        match self.in_flight.entry(payment_hash) {
-            Entry::Occupied(_) => {
-                return Err(LightningError::SendPaymentError(
-                    "payment hash exists".to_string(),
-                ));
-            },
-            Entry::Vacant(vacant) => {
-                vacant.insert(receiver);
-            },
-        }
-
-        self.network
-            .lock()
-            .await
-            .dispatch_payment(self.info.pubkey, route, payment_hash, sender);
-
-        Ok(())
-    }
 }
 
 /// Produces the node info for a mocked node, filling in the features that the simulator requires.
@@ -2238,19 +2206,6 @@ mod tests {
                 populate_network_graph(channels.clone(), Arc::new(SystemClock {})).unwrap(),
             );
 
-<<<<<<< HEAD
-            let scorer = Mutex::new(ProbabilisticScorer::new(
-=======
-<<<<<<< HEAD
-            let scorer = ProbabilisticScorer::new(
->>>>>>> 4a0f276 (Remove LDK specific scoring from PathFinder trait)
-                ProbabilisticScoringDecayParameters::default(),
-                routing_graph.clone(),
-                Arc::new(WrappedLog {}),
-            ));
-
-=======
->>>>>>> 3e72658 (Remove LDK specific scoring from PathFinder trait)
             // Collect pubkeys in-order, pushing the last node on separately because they don't have an outgoing
             // channel (they are not node_1 in any channel, only node_2).
             let mut nodes = channels
@@ -2523,6 +2478,7 @@ mod tests {
             Arc::new(Mutex::new(test_kit.graph)),
             test_kit.routing_graph.clone(),
             Arc::new(SystemClock {}),
+            test_kit.pathfinder.clone(),
         )
         .unwrap();