chore: Commit

3 files changed, 17 insertions, 14 deletions

diff --git a/crates/daemon/src/api/server/control.rs b/crates/daemon/src/api/control.rs
index a5e26355..a9d9cff3 100644
--- a/crates/daemon/src/api/server/control.rs
+++ b/crates/daemon/src/api/control.rs
@@ -6,15 +6,17 @@ use tokio::time::{self, MissedTickBehavior};
 use tonic::{Request, Response, Status};
 use tracing::{Level, instrument};
 
+use turtle::generated::{
+    DAEMON_PROTOCOL_VERSION,
+    control::{
+        ForceSyncReply, ForceSyncRequest, PathsReply, PathsRequest, StatusReply, StatusRequest,
+        control_server::{Control, ControlServer},
+    },
+};
+
 use crate::{
+    DAEMON_VERSION,
     aclient::{history::store::HistoryStore, record::sync, settings::Settings},
-    api::{
-        DAEMON_PROTOCOL_VERSION, DAEMON_VERSION,
-        generated::control::{
-            ForceSyncReply, ForceSyncRequest, PathsReply, PathsRequest, StatusReply, StatusRequest,
-            control_server::{Control, ControlServer},
-        },
-    },
     daemon::DaemonHandle,
     events::DaemonEvent,
 };
diff --git a/crates/daemon/src/api/server/history.rs b/crates/daemon/src/api/history.rs
index 0edf3b94..bcd2ee5a 100644
--- a/crates/daemon/src/api/server/history.rs
+++ b/crates/daemon/src/api/history.rs
@@ -10,20 +10,23 @@ use tracing::{Level, instrument};
 use crate::{
     aclient::{
         database::{ClientSqlite, current_context},
-        history::{History, HistoryId, store::HistoryStore},
+        history::store::HistoryStore,
         settings::Settings,
     },
-    api::{
+    daemon::DaemonHandle,
+    events::DaemonEvent,
+};
+use turtle::{
+    generated::{
         DAEMON_PROTOCOL_VERSION,
-        generated::history::{
+        history::{
             EndHistoryReply, EndHistoryRequest, HistoryEntry, HistoryEventKind, HistoryReply,
             HistoryRequest, StartHistoryReply, StartHistoryRequest, TailHistoryReply,
             TailHistoryRequest,
             history_server::{History as HistorySvc, HistoryServer},
         },
     },
-    daemon::DaemonHandle,
-    events::DaemonEvent,
+    history::{History, HistoryId},
 };
 
 /// The gRPC service implementation.
diff --git a/crates/daemon/src/api/server/mod.rs b/crates/daemon/src/api/server/mod.rs
deleted file mode 100644
index 8d475fe9..00000000
--- a/crates/daemon/src/api/server/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub(crate) mod control;
-pub(crate) mod history;