rename LdkNode to LdkServer

Author: randomlogin

README.md

@@ -16,7 +16,7 @@ lightning network development. It may be useful to you if you are:
 * LND ✅
 * CLN ✅
 * Eclair ✅️
-* LDK-server ✅
+* LDK-Server ✅
 
 See our [tracking issue](https://github.com/bitcoin-dev-project/sim-ln/issues/26)
 for updates on implementation support (contributions welcome!).
@@ -36,7 +36,7 @@ of the simulator uses keysend to execute payments, which must be enabled as foll
 * LND: `--accept-keysend`
 * CLN: enabled by default
 * Eclair: `-Declair.features.keysend=optional` (or `--features.keysend=optional` if you're using Polar)
-* LDK-server: enabled by default via `spontaneous_send`
+* LDK-Server: enabled by default via `spontaneous_send`
 
 NOTE: for CLN `keysend` to work with eclair, you need to add additional config to eclair:
 ```
@@ -99,7 +99,7 @@ The required access details will depend on the node implementation.
   "api_password": <password_to_authorize>
 }
 ```
-* LDK-server:
+* LDK-Server:
 ```
 {
   "address": <ip:port or domain:port>,

sim-cli/src/parsing.rs

@@ -9,9 +9,9 @@ use simln_lib::sim_node::{
     SimGraph, SimNode, SimulatedChannel,
 };
 use simln_lib::{
-    cln, cln::ClnNode, eclair, eclair::EclairNode, ldk, ldk::LdkNode, lnd, lnd::LndNode,
-    serializers, ActivityDefinition, Amount, Interval, LightningError, LightningNode, NodeId,
-    NodeInfo, Simulation, SimulationCfg, WriteResults,
+    cln, cln::ClnNode, eclair, eclair::EclairNode, ldk_server, ldk_server::LdkServer, lnd,
+    lnd::LndNode, serializers, ActivityDefinition, Amount, Interval, LightningError, LightningNode,
+    NodeId, NodeInfo, Simulation, SimulationCfg, WriteResults,
 };
 use simln_lib::{ShortChannelID, SimulationError};
 use std::collections::HashMap;
@@ -160,7 +160,7 @@ pub enum NodeConnection {
     Lnd(lnd::LndConnection),
     Cln(cln::ClnConnection),
     Eclair(eclair::EclairConnection),
-    Ldk(ldk::LdkConnection),
+    Ldk(ldk_server::LdkServerConnection),
 }
 
 /// Data structure that is used to parse information from the simulation file. It is used to
@@ -397,7 +397,7 @@ async fn get_clients(
             NodeConnection::Lnd(c) => Arc::new(Mutex::new(LndNode::new(c).await?)),
             NodeConnection::Cln(c) => Arc::new(Mutex::new(ClnNode::new(c).await?)),
             NodeConnection::Eclair(c) => Arc::new(Mutex::new(EclairNode::new(c).await?)),
-            NodeConnection::Ldk(c) => Arc::new(Mutex::new(LdkNode::new(c).await?)),
+            NodeConnection::Ldk(c) => Arc::new(Mutex::new(LdkServer::new(c).await?)),
         };
 
         let node_info = node.lock().await.get_info().clone();

simln-lib/src/ldk.rs simln-lib/src/ldk_server.rssimln-lib/src/ldk.rs renamed to simln-lib/src/ldk_server.rs

@@ -22,22 +22,22 @@ use crate::{
     serializers, Graph, LightningError, LightningNode, NodeInfo, PaymentOutcome, PaymentResult,
 };
 
-pub struct LdkNode {
+pub struct LdkServer {
     client: LdkServerClient,
     info: NodeInfo,
     network: Network,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct LdkConnection {
+pub struct LdkServerConnection {
     pub address: String,
     pub api_key: String,
     #[serde(deserialize_with = "serializers::deserialize_path")]
     pub cert: String,
 }
 
-impl LdkNode {
-    pub async fn new(connection: LdkConnection) -> Result<Self, LightningError> {
+impl LdkServer {
+    pub async fn new(connection: LdkServerConnection) -> Result<Self, LightningError> {
         let cert_pem = std::fs::read(&connection.cert).map_err(|err| {
             LightningError::ConnectionError(format!("Cannot load TLS cert: {err}"))
         })?;
@@ -81,7 +81,7 @@ impl LdkNode {
 }
 
 #[async_trait]
-impl LightningNode for LdkNode {
+impl LightningNode for LdkServer {
     fn get_info(&self) -> &NodeInfo {
         &self.info
     }
@@ -253,6 +253,9 @@ fn network_from_proto(value: i32) -> Result<Network, LightningError> {
     match value {
         0 => Ok(Network::Bitcoin),
         1 => Ok(Network::Testnet),
+        2 => Err(LightningError::GetInfoError(format!(
+            "testnet4 network is not supported"
+        ))),
         3 => Ok(Network::Signet),
         4 => Ok(Network::Regtest),
         other => Err(LightningError::GetInfoError(format!(

simln-lib/src/lib.rs

@@ -36,7 +36,7 @@ pub mod clock;
 mod defined_activity;
 pub mod eclair;
 pub mod latency_interceptor;
-pub mod ldk;
+pub mod ldk_server;
 pub mod lnd;
 mod random_activity;
 pub mod serializers;