Rename crates.

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/server_keys/acquire.rs

@@ -4,9 +4,6 @@ use std::{
 	time::Duration,
 };
 
-use conduwuit::{
-	debug, debug_error, debug_warn, error, implement, info, result::FlatOk, trace, warn,
-};
 use futures::{StreamExt, stream::FuturesUnordered};
 use ruma::{
 	CanonicalJsonObject, OwnedServerName, OwnedServerSigningKeyId, ServerName,
@@ -14,6 +11,9 @@ use ruma::{
 };
 use serde_json::value::RawValue as RawJsonValue;
 use tokio::time::{Instant, timeout_at};
+use tuwunel_core::{
+	debug, debug_error, debug_warn, error, implement, info, result::FlatOk, trace, warn,
+};
 
 use super::key_exists;
 

src/service/server_keys/get.rs

@@ -1,10 +1,10 @@
 use std::borrow::Borrow;
 
-use conduwuit::{Err, Result, implement};
 use ruma::{
 	CanonicalJsonObject, RoomVersionId, ServerName, ServerSigningKeyId,
 	api::federation::discovery::VerifyKey,
 };
+use tuwunel_core::{Err, Result, implement};
 
 use super::{PubKeyMap, PubKeys, extract_key};
 

src/service/server_keys/keypair.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use conduwuit::{Result, debug, debug_info, err, error, utils, utils::string_from_bytes};
-use database::Database;
 use ruma::{api::federation::discovery::VerifyKey, serde::Base64, signatures::Ed25519KeyPair};
+use tuwunel_core::{Result, debug, debug_info, err, error, utils, utils::string_from_bytes};
+use tuwunel_database::Database;
 
 use super::VerifyKeys;
 

src/service/server_keys/mod.rs

@@ -7,11 +7,6 @@ mod verify;
 
 use std::{collections::BTreeMap, sync::Arc, time::Duration};
 
-use conduwuit::{
-	Result, Server, implement,
-	utils::{IterStream, timepoint_from_now},
-};
-use database::{Deserialized, Json, Map};
 use futures::StreamExt;
 use ruma::{
 	CanonicalJsonObject, MilliSecondsSinceUnixEpoch, OwnedServerSigningKeyId, RoomVersionId,
@@ -21,6 +16,11 @@ use ruma::{
 	signatures::{Ed25519KeyPair, PublicKeyMap, PublicKeySet},
 };
 use serde_json::value::RawValue as RawJsonValue;
+use tuwunel_core::{
+	Result, Server, implement,
+	utils::{IterStream, timepoint_from_now},
+};
+use tuwunel_database::{Deserialized, Json, Map};
 
 use crate::{Dep, globals, sending};
 

src/service/server_keys/request.rs

@@ -1,6 +1,5 @@
 use std::{collections::BTreeMap, fmt::Debug};
 
-use conduwuit::{Err, Result, debug, implement};
 use ruma::{
 	OwnedServerName, OwnedServerSigningKeyId, ServerName, ServerSigningKeyId,
 	api::federation::discovery::{
@@ -9,6 +8,7 @@ use ruma::{
 		get_server_keys,
 	},
 };
+use tuwunel_core::{Err, Result, debug, implement};
 
 #[implement(super::Service)]
 pub(super) async fn batch_notary_request<'a, S, K>(

src/service/server_keys/sign.rs

@@ -1,5 +1,5 @@
-use conduwuit::{Result, implement};
 use ruma::{CanonicalJsonObject, RoomVersionId};
+use tuwunel_core::{Result, implement};
 
 #[implement(super::Service)]
 pub fn sign_json(&self, object: &mut CanonicalJsonObject) -> Result {

src/service/server_keys/verify.rs

@@ -1,8 +1,8 @@
-use conduwuit::{Err, Result, implement, pdu::gen_event_id_canonical_json};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, RoomVersionId, signatures::Verified,
 };
 use serde_json::value::RawValue as RawJsonValue;
+use tuwunel_core::{Err, Result, implement, pdu::gen_event_id_canonical_json};
 
 #[implement(super::Service)]
 pub async fn validate_and_add_event_id(