From 44e4dea2826b7f2d98b0e1b5aff795f490057a10 Mon Sep 17 00:00:00 2001
From: Vedat Can Keklik <vcankeklik@gmail.com>
Date: Thu, 1 Feb 2024 17:13:16 +0300
Subject: [PATCH] fix: Simpler comm

---
 Cargo.toml                                    |  2 +-
 cli/Cargo.toml                                |  2 +-
 cli/src/main.rs                               |  3 +--
 liblykia/Cargo.toml                           | 19 -------------------
 liblykia/src/lib.rs                           |  1 -
 liblykia/src/protocol/mod.rs                  |  1 -
 server/Cargo.toml                             | 12 ++++++++++--
 server/src/lib.rs                             |  1 +
 server/src/main.rs                            |  2 +-
 .../connection.rs => server/src/net/mod.rs    |  0
 10 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 liblykia/Cargo.toml
 delete mode 100644 liblykia/src/lib.rs
 delete mode 100644 liblykia/src/protocol/mod.rs
 rename liblykia/src/protocol/connection.rs => server/src/net/mod.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 890de455..0b61eec5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "1"
-members = ["server", "liblykia", "cli"]
+members = ["server", "cli"]
 
 [profile.release]
 opt-level = 3
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index cd118196..32c15a24 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 
 [dependencies]
 clap = { version = "4.4.6", features = ["derive"] }
-liblykia = { path = "../liblykia" }
+lykiadb-server = { path = "../server" }
 tokio = { version = "~1.35.1" }
diff --git a/cli/src/main.rs b/cli/src/main.rs
index 8397078c..886e2c63 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -1,11 +1,10 @@
 use std::{
     fs::File,
     io::{BufReader, Read},
-    time::Duration,
 };
 
 use clap::Parser;
-use liblykia::protocol::connection::{CommunicationError, Connection, Message, Request};
+use lykiadb_server::net::{CommunicationError, Connection, Message, Request};
 use tokio::net::TcpStream;
 
 #[derive(Parser, Debug)]
diff --git a/liblykia/Cargo.toml b/liblykia/Cargo.toml
deleted file mode 100644
index 03a76cb4..00000000
--- a/liblykia/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-authors = ["Vedat Can Keklik <vcankeklik@gmail.com>"]
-name = "liblykia"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bson = { version = "2.9.0" }
-serde = { version = "1.0.188", features=["derive", "rc"] }
-bytes = "1.5.0"
-tokio = { version = "~1.35.1", features = [
-    "macros",
-    "rt",
-    "rt-multi-thread",
-    "net",
-    "io-util",
-    "time",
-    "sync",
-] }
diff --git a/liblykia/src/lib.rs b/liblykia/src/lib.rs
deleted file mode 100644
index 1b800ecd..00000000
--- a/liblykia/src/lib.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod protocol;
diff --git a/liblykia/src/protocol/mod.rs b/liblykia/src/protocol/mod.rs
deleted file mode 100644
index b3b606b4..00000000
--- a/liblykia/src/protocol/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod connection;
diff --git a/server/Cargo.toml b/server/Cargo.toml
index bb2dc3f2..c922b206 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-liblykia = { path = "../liblykia" }
+bytes = "1.5.0"
 bson = { version = "2.9.0" }
 bumpalo = "3.12.2"
 phf = { version = "0.11", default-features = false, features = ["macros"] }
@@ -14,7 +14,15 @@ serde = { version = "1.0.188", features=["derive", "rc"] }
 serde_json = "1.0.105"
 ariadne = { features = ["auto-color"] }
 assert-json-diff = "2.0.2"
-tokio = { version = "~1.35.1" }
+tokio = { version = "~1.35.1", features = [
+    "macros",
+    "rt",
+    "rt-multi-thread",
+    "net",
+    "io-util",
+    "time",
+    "sync",
+] }
 tokio-stream = { version = "~0.1.6", features = ["net"] }
 
 [dev-dependencies]
diff --git a/server/src/lib.rs b/server/src/lib.rs
index fa87c1c5..5dcfff15 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,3 +1,4 @@
 pub mod lang;
 pub mod runtime;
 pub mod util;
+pub mod net;
\ No newline at end of file
diff --git a/server/src/main.rs b/server/src/main.rs
index 78c8860d..8d6122cf 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -1,6 +1,6 @@
 use std::io::Error;
 
-use liblykia::protocol::connection::{CommunicationError, Connection, Message, Request, Response};
+use lykiadb_server::net::{CommunicationError, Connection, Message, Request, Response};
 use lykiadb_server::runtime::types::RV;
 use lykiadb_server::runtime::{Runtime, RuntimeMode};
 use tokio::net::{TcpListener, TcpStream};
diff --git a/liblykia/src/protocol/connection.rs b/server/src/net/mod.rs
similarity index 100%
rename from liblykia/src/protocol/connection.rs
rename to server/src/net/mod.rs