Rename event_graph2 to event_graph and temp disable some old dependents.

tau needs to be rewritten to use the new DAG after IRC is well-tested.

Cargo.lock

@@ -925,7 +925,7 @@ dependencies = [
  "atty",
  "bitflags 1.3.2",
  "strsim 0.8.0",
- "textwrap 0.11.0",
+ "textwrap",
  "unicode-width",
  "vec_map",
 ]
@@ -1004,17 +1004,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
-[[package]]
-name = "colored"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
-dependencies = [
- "is-terminal",
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.2.0"
@@ -2822,41 +2811,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "genev"
-version = "0.4.1"
-dependencies = [
- "clap 4.4.1",
- "darkfi",
- "darkfi-serial",
- "genevd",
- "log",
- "simplelog",
- "smol",
- "tinyjson",
- "url",
-]
-
-[[package]]
-name = "genevd"
-version = "0.4.1"
-dependencies = [
- "async-trait",
- "darkfi",
- "darkfi-serial",
- "easy-parallel",
- "log",
- "serde",
- "signal-hook",
- "signal-hook-async-std",
- "simplelog",
- "smol",
- "structopt",
- "structopt-toml",
- "tinyjson",
- "url",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -5232,12 +5186,6 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
-[[package]]
-name = "smawk"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
-
 [[package]]
 name = "smol"
 version = "1.3.0"
@@ -5497,56 +5445,6 @@ version = "0.12.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
 
-[[package]]
-name = "tau"
-version = "0.4.1"
-dependencies = [
- "chrono",
- "clap 4.4.1",
- "colored",
- "darkfi",
- "libc",
- "log",
- "prettytable-rs",
- "serde",
- "simplelog",
- "smol",
- "taud",
- "term_grid",
- "textwrap 0.16.0",
- "tinyjson",
- "url",
-]
-
-[[package]]
-name = "taud"
-version = "0.4.1"
-dependencies = [
- "async-trait",
- "bs58",
- "chrono",
- "crypto_box",
- "darkfi",
- "darkfi-serial",
- "easy-parallel",
- "futures",
- "hex",
- "libc",
- "log",
- "rand 0.8.5",
- "serde",
- "signal-hook",
- "signal-hook-async-std",
- "simplelog",
- "smol",
- "structopt",
- "structopt-toml",
- "thiserror",
- "tinyjson",
- "toml 0.7.6",
- "url",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.8.0"
@@ -5571,15 +5469,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "term_grid"
-version = "0.2.0"
-source = "git+https://github.com/Dastan-glitch/rust-term-grid.git#51c28e47aad0fb9f67de558e9b80c525cd01a4ae"
-dependencies = [
- "colored",
- "unicode-width",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.1.3"
@@ -5598,17 +5487,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-dependencies = [
- "smawk",
- "unicode-linebreak",
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.47"
@@ -6576,12 +6454,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
 [[package]]
 name = "unicode-normalization"
 version = "0.1.22"

Cargo.toml

@@ -27,11 +27,11 @@ members = [
     "bin/faucetd",
     #"bin/fud/fu",
     "bin/fud/fud",
-    "bin/genev/genevd",
-    "bin/genev/genev-cli",
+    #"bin/genev/genevd",
+    #"bin/genev/genev-cli",
     "bin/darkirc",
-    "bin/tau/taud",
-    "bin/tau/tau-cli",
+    #"bin/tau/taud",
+    #"bin/tau/tau-cli",
     "bin/vanityaddr",
     "bin/lilith",
 

bin/darkirc/src/irc/client.rs

@@ -25,7 +25,7 @@ use std::{
 };
 
 use darkfi::{
-    event_graph2::{proto::EventPut, Event, NULL_ID},
+    event_graph::{proto::EventPut, Event, NULL_ID},
     system::Subscription,
     Error, Result,
 };

bin/darkirc/src/irc/server.rs

@@ -20,7 +20,7 @@ use std::{collections::HashMap, fs::File, io::BufReader, path::PathBuf, sync::Ar
 
 use async_rustls::{rustls, TlsAcceptor};
 use darkfi::{
-    event_graph2::Event,
+    event_graph::Event,
     system::{StoppableTask, StoppableTaskPtr, Subscription},
     util::path::expand_path,
     Error, Result,

bin/darkirc/src/main.rs

@@ -19,7 +19,7 @@ use std::{collections::HashSet, sync::Arc};
 
 use darkfi::{
     async_daemonize, cli_desc,
-    event_graph2::{proto::ProtocolEventGraph, EventGraph, EventGraphPtr},
+    event_graph::{proto::ProtocolEventGraph, EventGraph, EventGraphPtr},
     net::{settings::SettingsOpt, P2p, P2pPtr, SESSION_ALL},
     rpc::{
         jsonrpc::JsonSubscriber,

src/event_graph2/tests.rs → src/event_graph/tests.rs

@@ -26,7 +26,7 @@ use smol::{channel, future, Executor};
 use url::Url;
 
 use crate::{
-    event_graph2::{
+    event_graph::{
         proto::{EventPut, ProtocolEventGraph},
         Event, EventGraph, NULL_ID,
     },

src/lib.rs

@@ -36,9 +36,6 @@ pub mod geode;
 #[cfg(feature = "event-graph")]
 pub mod event_graph;
 
-#[cfg(feature = "event-graph")]
-pub mod event_graph2;
-
 #[cfg(feature = "net")]
 pub mod net;