From 4a64fa06a254dc9a462f8161e64114f83712fa3b Mon Sep 17 00:00:00 2001 From: Carla Kirk-Cohen Date: Thu, 14 Nov 2024 11:20:22 -0500 Subject: [PATCH 1/2] multi: rename sim-lib to simln-lib --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- sim-cli/Cargo.toml | 2 +- sim-cli/src/main.rs | 5 ++--- {sim-lib => simln-lib}/Cargo.toml | 4 ++-- {sim-lib => simln-lib}/src/cln.rs | 0 {sim-lib => simln-lib}/src/defined_activity.rs | 0 {sim-lib => simln-lib}/src/lib.rs | 0 {sim-lib => simln-lib}/src/lnd.rs | 0 {sim-lib => simln-lib}/src/random_activity.rs | 0 {sim-lib => simln-lib}/src/serializers.rs | 0 {sim-lib => simln-lib}/src/sim_node.rs | 0 {sim-lib => simln-lib}/src/test_utils.rs | 0 13 files changed, 8 insertions(+), 9 deletions(-) rename {sim-lib => simln-lib}/Cargo.toml (96%) rename {sim-lib => simln-lib}/src/cln.rs (100%) rename {sim-lib => simln-lib}/src/defined_activity.rs (100%) rename {sim-lib => simln-lib}/src/lib.rs (100%) rename {sim-lib => simln-lib}/src/lnd.rs (100%) rename {sim-lib => simln-lib}/src/random_activity.rs (100%) rename {sim-lib => simln-lib}/src/serializers.rs (100%) rename {sim-lib => simln-lib}/src/sim_node.rs (100%) rename {sim-lib => simln-lib}/src/test_utils.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index dcfb72e1..bfa0526d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2096,13 +2096,13 @@ dependencies = [ "rand", "serde", "serde_json", - "sim-lib", + "simln-lib", "simple_logger", "tokio", ] [[package]] -name = "sim-lib" +name = "simln-lib" version = "0.1.0" dependencies = [ "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 4581e387..fd5e2e96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,5 +3,5 @@ resolver = "2" members = [ "sim-cli", - "sim-lib", + "simln-lib", ] diff --git a/sim-cli/Cargo.toml b/sim-cli/Cargo.toml index d3f5da49..baeca352 100644 --- a/sim-cli/Cargo.toml +++ b/sim-cli/Cargo.toml @@ -16,7 +16,7 @@ log = "0.4.20" serde = "1.0.183" serde_json = "1.0.104" simple_logger = "4.2.0" -sim-lib = { path = "../sim-lib" } +simln-lib = { path = "../simln-lib" } tokio = { version = "1.26.0", features = ["full"] } bitcoin = { version = "0.30.1" } ctrlc = "3.4.0" diff --git a/sim-cli/src/main.rs b/sim-cli/src/main.rs index 6375ba9d..e3bcc946 100644 --- a/sim-cli/src/main.rs +++ b/sim-cli/src/main.rs @@ -1,5 +1,4 @@ use bitcoin::secp256k1::PublicKey; -use sim_lib::SimulationCfg; use std::collections::HashMap; use std::path::PathBuf; use std::sync::Arc; @@ -9,9 +8,9 @@ use anyhow::anyhow; use clap::builder::TypedValueParser; use clap::Parser; use log::LevelFilter; -use sim_lib::{ +use simln_lib::{ cln::ClnNode, lnd::LndNode, ActivityDefinition, LightningError, LightningNode, NodeConnection, - NodeId, SimParams, Simulation, WriteResults, + NodeId, SimParams, Simulation, SimulationCfg, WriteResults, }; use simple_logger::SimpleLogger; diff --git a/sim-lib/Cargo.toml b/simln-lib/Cargo.toml similarity index 96% rename from sim-lib/Cargo.toml rename to simln-lib/Cargo.toml index 65bb822e..c6b3b9a6 100644 --- a/sim-lib/Cargo.toml +++ b/simln-lib/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sim-lib" +name = "simln-lib" version = "0.1.0" edition = "2021" description = """ @@ -33,4 +33,4 @@ mockall = "0.12.1" rand_chacha = "0.3.1" [dev-dependencies] -ntest = "0.9.0" \ No newline at end of file +ntest = "0.9.0" diff --git a/sim-lib/src/cln.rs b/simln-lib/src/cln.rs similarity index 100% rename from sim-lib/src/cln.rs rename to simln-lib/src/cln.rs diff --git a/sim-lib/src/defined_activity.rs b/simln-lib/src/defined_activity.rs similarity index 100% rename from sim-lib/src/defined_activity.rs rename to simln-lib/src/defined_activity.rs diff --git a/sim-lib/src/lib.rs b/simln-lib/src/lib.rs similarity index 100% rename from sim-lib/src/lib.rs rename to simln-lib/src/lib.rs diff --git a/sim-lib/src/lnd.rs b/simln-lib/src/lnd.rs similarity index 100% rename from sim-lib/src/lnd.rs rename to simln-lib/src/lnd.rs diff --git a/sim-lib/src/random_activity.rs b/simln-lib/src/random_activity.rs similarity index 100% rename from sim-lib/src/random_activity.rs rename to simln-lib/src/random_activity.rs diff --git a/sim-lib/src/serializers.rs b/simln-lib/src/serializers.rs similarity index 100% rename from sim-lib/src/serializers.rs rename to simln-lib/src/serializers.rs diff --git a/sim-lib/src/sim_node.rs b/simln-lib/src/sim_node.rs similarity index 100% rename from sim-lib/src/sim_node.rs rename to simln-lib/src/sim_node.rs diff --git a/sim-lib/src/test_utils.rs b/simln-lib/src/test_utils.rs similarity index 100% rename from sim-lib/src/test_utils.rs rename to simln-lib/src/test_utils.rs From 14dd200a3f7dfa1469bbbddc6033541c4749467d Mon Sep 17 00:00:00 2001 From: Carla Kirk-Cohen Date: Thu, 14 Nov 2024 11:15:36 -0500 Subject: [PATCH 2/2] multi: add license to sim-lib and sim-cli --- sim-cli/Cargo.toml | 1 + simln-lib/Cargo.toml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sim-cli/Cargo.toml b/sim-cli/Cargo.toml index baeca352..5786d3a3 100644 --- a/sim-cli/Cargo.toml +++ b/sim-cli/Cargo.toml @@ -2,6 +2,7 @@ name = "sim-cli" version = "0.1.0" edition = "2021" +license = "MIT" description = """ Instantly simulate real-world Lightning network activity """ diff --git a/simln-lib/Cargo.toml b/simln-lib/Cargo.toml index c6b3b9a6..fce8d401 100644 --- a/simln-lib/Cargo.toml +++ b/simln-lib/Cargo.toml @@ -2,8 +2,9 @@ name = "simln-lib" version = "0.1.0" edition = "2021" +license = "MIT" description = """ -Backend logic of the SimLN project. Contains all the functionality to build your own simulator +Components to build a network-agnostic lightning payments simulator. Used as the backend for the Sim-LN project. """ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html