diff --git a/.gitignore b/.gitignore index 9c88d8bbe..6a1402a47 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ /genev /ircd /ircd2 +/darkirc /tau /taud /vanityaddr diff --git a/Cargo.lock b/Cargo.lock index c58c6808b..daa6549b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1349,6 +1349,38 @@ dependencies = [ "url", ] +[[package]] +name = "darkirc" +version = "0.4.1" +dependencies = [ + "async-std", + "async-trait", + "bs58", + "chrono", + "clap 4.2.2", + "crypto_box", + "ctrlc", + "darkfi", + "darkfi-serial", + "easy-parallel", + "futures", + "futures-rustls 0.24.0", + "hex", + "log", + "rand", + "ripemd", + "rustls-pemfile", + "serde", + "serde_json", + "simplelog", + "sled", + "smol", + "structopt", + "structopt-toml", + "toml 0.7.3", + "url", +] + [[package]] name = "darling" version = "0.10.2" @@ -2577,38 +2609,6 @@ dependencies = [ "url", ] -[[package]] -name = "ircd2" -version = "0.4.1" -dependencies = [ - "async-std", - "async-trait", - "bs58", - "chrono", - "clap 4.2.2", - "crypto_box", - "ctrlc", - "darkfi", - "darkfi-serial", - "easy-parallel", - "futures", - "futures-rustls 0.24.0", - "hex", - "log", - "rand", - "ripemd", - "rustls-pemfile", - "serde", - "serde_json", - "simplelog", - "sled", - "smol", - "structopt", - "structopt-toml", - "toml 0.7.3", - "url", -] - [[package]] name = "is-terminal" version = "0.4.7" diff --git a/Cargo.toml b/Cargo.toml index cb39ed7be..7777d878e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ members = [ "bin/genev/genevd", "bin/genev/genev-cli", "bin/ircd", - "bin/ircd2", + "bin/darkirc", "bin/dnetview", #"bin/dao/daod", #"bin/dao/dao-cli", diff --git a/bin/ircd2/Cargo.toml b/bin/darkirc/Cargo.toml similarity index 98% rename from bin/ircd2/Cargo.toml rename to bin/darkirc/Cargo.toml index 0dad19ebe..13bc748c5 100644 --- a/bin/ircd2/Cargo.toml +++ b/bin/darkirc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ircd2" +name = "darkirc" description = "P2P IRC daemon" version = "0.4.1" edition = "2021" diff --git a/bin/ircd2/README.md b/bin/darkirc/README.md similarity index 100% rename from bin/ircd2/README.md rename to bin/darkirc/README.md diff --git a/bin/ircd2/config/inbound.toml b/bin/darkirc/config/inbound.toml similarity index 100% rename from bin/ircd2/config/inbound.toml rename to bin/darkirc/config/inbound.toml diff --git a/bin/ircd2/config/outbound.toml b/bin/darkirc/config/outbound.toml similarity index 100% rename from bin/ircd2/config/outbound.toml rename to bin/darkirc/config/outbound.toml diff --git a/bin/ircd2/config/seed.toml b/bin/darkirc/config/seed.toml similarity index 100% rename from bin/ircd2/config/seed.toml rename to bin/darkirc/config/seed.toml diff --git a/bin/ircd2/ircd_config.toml b/bin/darkirc/ircd_config.toml similarity index 100% rename from bin/ircd2/ircd_config.toml rename to bin/darkirc/ircd_config.toml diff --git a/bin/ircd2/script/README.md b/bin/darkirc/script/README.md similarity index 100% rename from bin/ircd2/script/README.md rename to bin/darkirc/script/README.md diff --git a/bin/ircd2/script/meetbot.py b/bin/darkirc/script/meetbot.py similarity index 100% rename from bin/ircd2/script/meetbot.py rename to bin/darkirc/script/meetbot.py diff --git a/bin/ircd2/script/meetbot_cfg.py b/bin/darkirc/script/meetbot_cfg.py similarity index 100% rename from bin/ircd2/script/meetbot_cfg.py rename to bin/darkirc/script/meetbot_cfg.py diff --git a/bin/ircd2/src/crypto.rs b/bin/darkirc/src/crypto.rs similarity index 100% rename from bin/ircd2/src/crypto.rs rename to bin/darkirc/src/crypto.rs diff --git a/bin/ircd2/src/irc/client.rs b/bin/darkirc/src/irc/client.rs similarity index 100% rename from bin/ircd2/src/irc/client.rs rename to bin/darkirc/src/irc/client.rs diff --git a/bin/ircd2/src/irc/mod.rs b/bin/darkirc/src/irc/mod.rs similarity index 100% rename from bin/ircd2/src/irc/mod.rs rename to bin/darkirc/src/irc/mod.rs diff --git a/bin/ircd2/src/irc/server.rs b/bin/darkirc/src/irc/server.rs similarity index 100% rename from bin/ircd2/src/irc/server.rs rename to bin/darkirc/src/irc/server.rs diff --git a/bin/ircd2/src/irc/server/nickserv.rs b/bin/darkirc/src/irc/server/nickserv.rs similarity index 99% rename from bin/ircd2/src/irc/server/nickserv.rs rename to bin/darkirc/src/irc/server/nickserv.rs index 9c9b48013..d31000d1b 100644 --- a/bin/ircd2/src/irc/server/nickserv.rs +++ b/bin/darkirc/src/irc/server/nickserv.rs @@ -24,7 +24,7 @@ use crate::PrivMsgEvent; #[derive(Debug, Clone, Default)] pub struct NickServ { - db: BTreeMap, + _db: BTreeMap, } impl NickServ { diff --git a/bin/ircd2/src/main.rs b/bin/darkirc/src/main.rs similarity index 100% rename from bin/ircd2/src/main.rs rename to bin/darkirc/src/main.rs diff --git a/bin/ircd2/src/privmsg.rs b/bin/darkirc/src/privmsg.rs similarity index 100% rename from bin/ircd2/src/privmsg.rs rename to bin/darkirc/src/privmsg.rs diff --git a/bin/ircd2/src/rpc.rs b/bin/darkirc/src/rpc.rs similarity index 100% rename from bin/ircd2/src/rpc.rs rename to bin/darkirc/src/rpc.rs diff --git a/bin/ircd2/src/settings.rs b/bin/darkirc/src/settings.rs similarity index 100% rename from bin/ircd2/src/settings.rs rename to bin/darkirc/src/settings.rs