From 9510d9c765695a641a4123fd37cebcd63faa0b88 Mon Sep 17 00:00:00 2001
From: Patrick Michl <huanzodev@gmail.com>
Date: Thu, 14 Jul 2022 22:41:03 +0200
Subject: [PATCH] fix warnings and remove old migrations

---
 Cargo.lock                                          | 13 -------------
 neo/Cargo.toml                                      |  3 +--
 neo/migrations/20220423204756_add_user.sql          |  9 ---------
 neo/migrations/20220424172900_add_devices.sql       | 11 -----------
 neo/migrations/20220424175554_add_sessions.sql      | 10 ----------
 neo/migrations/20220507162217_add_rooms.sql         |  8 --------
 neo/migrations/20220507162532_add_events.sql        | 13 -------------
 neo/src/api/client_server/errors/api_error.rs       |  2 ++
 .../client_server/errors/authentication_error.rs    |  2 ++
 neo/src/types/error_code.rs                         |  1 +
 10 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100644 neo/migrations/20220423204756_add_user.sql
 delete mode 100644 neo/migrations/20220424172900_add_devices.sql
 delete mode 100644 neo/migrations/20220424175554_add_sessions.sql
 delete mode 100644 neo/migrations/20220507162217_add_rooms.sql
 delete mode 100644 neo/migrations/20220507162532_add_events.sql

diff --git a/Cargo.lock b/Cargo.lock
index e15aecc..a1bfd3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -294,18 +294,6 @@ dependencies = [
  "mime",
 ]
 
-[[package]]
-name = "axum-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6293dae2ec708e679da6736e857cf8532886ef258e92930f38279c12641628b8"
-dependencies = [
- "heck 0.4.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "bae"
 version = "0.1.7"
@@ -1176,7 +1164,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "axum",
- "axum-macros",
  "http",
  "neo-entity",
  "neo-migration",
diff --git a/neo/Cargo.toml b/neo/Cargo.toml
index 08ca72a..6af392c 100644
--- a/neo/Cargo.toml
+++ b/neo/Cargo.toml
@@ -10,13 +10,12 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 serde = {version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tower-http = { version = "0.2", features = ["cors", "trace"]}
+tower-http = { version = "0.2", features = ["cors", "trace"] }
 anyhow = "1.0"
 thiserror = "1.0"
 rand = { version = "0.8.5", features = ["std"] }
 uuid = { version = "1.0", features = ["v4"] }
 ruma = { version = "0.6.4", features = ["client-api", "compat"] }
-axum-macros = "0.2.2"
 http = "0.2.8"
 sea-orm = { version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false }
 neo-entity = { version = "*", path = "../neo-entity" }
diff --git a/neo/migrations/20220423204756_add_user.sql b/neo/migrations/20220423204756_add_user.sql
deleted file mode 100644
index adde1cc..0000000
--- a/neo/migrations/20220423204756_add_user.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Add migration script here
-CREATE TABLE users(
-    uuid TEXT PRIMARY KEY NOT NULL,
-    user_id CHAR(255) NOT NULL,
-    display_name TEXT NOT NULL,
-    password_hash TEXT NOT NULL
-);
-
-CREATE INDEX user_id_index ON users (user_id);
\ No newline at end of file
diff --git a/neo/migrations/20220424172900_add_devices.sql b/neo/migrations/20220424172900_add_devices.sql
deleted file mode 100644
index 70fae10..0000000
--- a/neo/migrations/20220424172900_add_devices.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Add migration script here
-
-CREATE TABLE devices(
-    uuid TEXT PRIMARY KEY NOT NULL,
-    user_uuid INT NOT NULL,
-    device_id TEXT NOT NULL,
-    display_name TEXT NOT NULL,
-    FOREIGN KEY(user_uuid) REFERENCES users(uuid)
-);
-
-CREATE INDEX device_id_index ON devices (device_id);
\ No newline at end of file
diff --git a/neo/migrations/20220424175554_add_sessions.sql b/neo/migrations/20220424175554_add_sessions.sql
deleted file mode 100644
index f4b16eb..0000000
--- a/neo/migrations/20220424175554_add_sessions.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- Add migration script here
-
-CREATE TABLE sessions(
-    uuid TEXT PRIMARY KEY NOT NULL,
-    device_uuid INT NOT NULL,
-    key TEXT NOT NULL,
-    FOREIGN KEY(device_uuid) REFERENCES devices(uuid)
-);
-
-CREATE INDEX key_index ON sessions (key);
\ No newline at end of file
diff --git a/neo/migrations/20220507162217_add_rooms.sql b/neo/migrations/20220507162217_add_rooms.sql
deleted file mode 100644
index d79eb0a..0000000
--- a/neo/migrations/20220507162217_add_rooms.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- Add migration script here
-
-CREATE TABLE rooms(
-    uuid TEXT PRIMARY KEY NOT NULL,
-    name TEXT NOT NULL
-);
-
-CREATE UNIQUE INDEX name_index ON rooms(name); 
\ No newline at end of file
diff --git a/neo/migrations/20220507162532_add_events.sql b/neo/migrations/20220507162532_add_events.sql
deleted file mode 100644
index 9711628..0000000
--- a/neo/migrations/20220507162532_add_events.sql
+++ /dev/null
@@ -1,13 +0,0 @@
--- Add migration script here
-
-CREATE TABLE events(
-    uuid TEXT PRIMARY KEY NOT NULL,
-    room_uuid TEXT NOT NULL,
-    type TEXT NOT NULL,
-    state_key TEXT,
-    sender_uuid TEXT NOT NULL,
-    origin_server_ts INT NOT NULL,
-    content TEXT NOT NULL,
-    FOREIGN KEY(room_uuid) REFERENCES rooms(uuid),
-    FOREIGN KEY(sender_uuid) REFERENCES users(uuid)
-);
\ No newline at end of file
diff --git a/neo/src/api/client_server/errors/api_error.rs b/neo/src/api/client_server/errors/api_error.rs
index 8d09122..656e64e 100644
--- a/neo/src/api/client_server/errors/api_error.rs
+++ b/neo/src/api/client_server/errors/api_error.rs
@@ -19,6 +19,7 @@ macro_rules! map_err {
 }
 
 #[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
 pub enum ApiError {
     #[error("Registration Error")]
     RegistrationError(#[from] RegistrationError),
@@ -74,6 +75,7 @@ impl IntoResponse for ApiError {
             )
                 .into_response()
             }
+            #[allow(unreachable_patterns)]
             _ => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
         }
     }
diff --git a/neo/src/api/client_server/errors/authentication_error.rs b/neo/src/api/client_server/errors/authentication_error.rs
index 3b7927f..d7dfd51 100644
--- a/neo/src/api/client_server/errors/authentication_error.rs
+++ b/neo/src/api/client_server/errors/authentication_error.rs
@@ -4,7 +4,9 @@ use crate::types::error_code::ErrorCode;
 
 use super::ErrorResponse;
 
+#[allow(unused)]
 #[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
 pub enum AuthenticationError {
     #[error("UserId is missing")]
     MissingUserId,
diff --git a/neo/src/types/error_code.rs b/neo/src/types/error_code.rs
index 5b48e5d..ef958be 100644
--- a/neo/src/types/error_code.rs
+++ b/neo/src/types/error_code.rs
@@ -1,3 +1,4 @@
+#[allow(unused)]
 #[non_exhaustive]
 #[derive(Clone, Debug)]
 pub enum ErrorCode {