Rename crates.

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

src/api/client/sync/mod.rs

@@ -2,12 +2,6 @@ mod v3;
 mod v4;
 mod v5;
 
-use conduwuit::{
-	Error, PduCount, Result,
-	matrix::pdu::PduEvent,
-	utils::stream::{BroadbandExt, ReadyExt, TryIgnore},
-};
-use conduwuit_service::Services;
 use futures::{StreamExt, pin_mut};
 use ruma::{
 	RoomId, UserId,
@@ -15,6 +9,12 @@ use ruma::{
 		self, Beacon, CallInvite, PollStart, RoomEncrypted, RoomMessage, Sticker,
 	},
 };
+use tuwunel_core::{
+	Error, PduCount, Result,
+	matrix::pdu::PduEvent,
+	utils::stream::{BroadbandExt, ReadyExt, TryIgnore},
+};
+use tuwunel_service::Services;
 
 pub(crate) use self::{
 	v3::sync_events_route, v4::sync_events_v4_route, v5::sync_events_v5_route,

src/api/client/sync/v3.rs

@@ -5,30 +5,6 @@ use std::{
 };
 
 use axum::extract::State;
-use conduwuit::{
-	Result, at, err, error, extract_variant, is_equal_to,
-	matrix::{
-		Event,
-		pdu::{EventHash, PduCount, PduEvent},
-	},
-	pair_of, ref_at,
-	result::FlatOk,
-	utils::{
-		self, BoolExt, FutureBoolExt, IterStream, ReadyExt, TryFutureExtExt,
-		future::{OptionStream, ReadyEqExt},
-		math::ruma_from_u64,
-		stream::{BroadbandExt, Tools, TryExpect, WidebandExt},
-	},
-	warn,
-};
-use conduwuit_service::{
-	Services,
-	rooms::{
-		lazy_loading,
-		lazy_loading::{Options, Witness},
-		short::ShortStateHash,
-	},
-};
 use futures::{
 	FutureExt, StreamExt, TryFutureExt, TryStreamExt,
 	future::{OptionFuture, join, join3, join4, join5, try_join, try_join4},
@@ -57,7 +33,30 @@ use ruma::{
 	serde::Raw,
 	uint,
 };
-use service::rooms::short::{ShortEventId, ShortStateKey};
+use tuwunel_core::{
+	Result, at, err, error, extract_variant, is_equal_to,
+	matrix::{
+		Event,
+		pdu::{EventHash, PduCount, PduEvent},
+	},
+	pair_of, ref_at,
+	result::FlatOk,
+	utils::{
+		self, BoolExt, FutureBoolExt, IterStream, ReadyExt, TryFutureExtExt,
+		future::{OptionStream, ReadyEqExt},
+		math::ruma_from_u64,
+		stream::{BroadbandExt, Tools, TryExpect, WidebandExt},
+	},
+	warn,
+};
+use tuwunel_service::{
+	Services,
+	rooms::{
+		lazy_loading,
+		lazy_loading::{Options, Witness},
+		short::{ShortEventId, ShortStateHash, ShortStateKey},
+	},
+};
 
 use super::{load_timeline, share_encrypted_room};
 use crate::{Ruma, RumaResponse, client::ignored_filter};

src/api/client/sync/v4.rs

@@ -5,20 +5,6 @@ use std::{
 };
 
 use axum::extract::State;
-use conduwuit::{
-	Err, Error, PduCount, PduEvent, Result, debug, error, extract_variant,
-	matrix::TypeStateKey,
-	utils::{
-		BoolExt, IterStream, ReadyExt, TryFutureExtExt,
-		math::{ruma_from_usize, usize_from_ruma, usize_from_u64_truncated},
-	},
-	warn,
-};
-use conduwuit_service::{
-	Services,
-	rooms::read_receipt::pack_receipts,
-	sync::{into_db_key, into_snake_key},
-};
 use futures::{FutureExt, StreamExt, TryFutureExt};
 use ruma::{
 	MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, RoomId, UInt, UserId,
@@ -35,6 +21,20 @@ use ruma::{
 	serde::Raw,
 	uint,
 };
+use tuwunel_core::{
+	Err, Error, PduCount, PduEvent, Result, debug, error, extract_variant,
+	matrix::TypeStateKey,
+	utils::{
+		BoolExt, IterStream, ReadyExt, TryFutureExtExt,
+		math::{ruma_from_usize, usize_from_ruma, usize_from_u64_truncated},
+	},
+	warn,
+};
+use tuwunel_service::{
+	Services,
+	rooms::read_receipt::pack_receipts,
+	sync::{into_db_key, into_snake_key},
+};
 
 use super::{load_timeline, share_encrypted_room};
 use crate::{

src/api/client/sync/v5.rs

@@ -6,21 +6,6 @@ use std::{
 };
 
 use axum::extract::State;
-use conduwuit::{
-	Err, Error, Result, error, extract_variant, is_equal_to,
-	matrix::{
-		TypeStateKey,
-		pdu::{PduCount, PduEvent},
-	},
-	trace,
-	utils::{
-		BoolExt, FutureBoolExt, IterStream, ReadyExt, TryFutureExtExt,
-		future::ReadyEqExt,
-		math::{ruma_from_usize, usize_from_ruma},
-	},
-	warn,
-};
-use conduwuit_service::{Services, rooms::read_receipt::pack_receipts, sync::into_snake_key};
 use futures::{
 	FutureExt, Stream, StreamExt, TryFutureExt,
 	future::{OptionFuture, join3, try_join4},
@@ -37,6 +22,21 @@ use ruma::{
 	serde::Raw,
 	uint,
 };
+use tuwunel_core::{
+	Err, Error, Result, error, extract_variant, is_equal_to,
+	matrix::{
+		TypeStateKey,
+		pdu::{PduCount, PduEvent},
+	},
+	trace,
+	utils::{
+		BoolExt, FutureBoolExt, IterStream, ReadyExt, TryFutureExtExt,
+		future::ReadyEqExt,
+		math::{ruma_from_usize, usize_from_ruma},
+	},
+	warn,
+};
+use tuwunel_service::{Services, rooms::read_receipt::pack_receipts, sync::into_snake_key};
 
 use super::share_encrypted_room;
 use crate::{