remove additional unnecessary Arc

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

src/service/rooms/event_handler/fetch_and_handle_outliers.rs

@@ -1,6 +1,5 @@
 use std::{
 	collections::{BTreeMap, HashSet, VecDeque, hash_map},
-	sync::Arc,
 	time::Instant,
 };
 
@@ -8,7 +7,6 @@ use conduwuit::{
 	PduEvent, debug, debug_error, debug_warn, implement, pdu, trace,
 	utils::continue_exponential_backoff_secs, warn,
 };
-use futures::TryFutureExt;
 use ruma::{
 	CanonicalJsonValue, OwnedEventId, RoomId, ServerName, api::federation::event::get_event,
 };
@@ -31,7 +29,7 @@ pub(super) async fn fetch_and_handle_outliers<'a>(
 	events: &'a [OwnedEventId],
 	create_event: &'a PduEvent,
 	room_id: &'a RoomId,
-) -> Vec<(Arc<PduEvent>, Option<BTreeMap<String, CanonicalJsonValue>>)> {
+) -> Vec<(PduEvent, Option<BTreeMap<String, CanonicalJsonValue>>)> {
 	let back_off = |id| match self
 		.services
 		.globals
@@ -53,7 +51,7 @@ pub(super) async fn fetch_and_handle_outliers<'a>(
 		// a. Look in the main timeline (pduid_pdu tree)
 		// b. Look at outlier pdu tree
 		// (get_pdu_json checks both)
-		if let Ok(local_pdu) = self.services.timeline.get_pdu(id).map_ok(Arc::new).await {
+		if let Ok(local_pdu) = self.services.timeline.get_pdu(id).await {
 			trace!("Found {id} in db");
 			events_with_auth_events.push((id, Some(local_pdu), vec![]));
 			continue;

src/service/rooms/event_handler/fetch_prev.rs

@@ -1,7 +1,4 @@
-use std::{
-	collections::{BTreeMap, HashMap, HashSet, VecDeque},
-	sync::Arc,
-};
+use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
 
 use conduwuit::{
 	PduEvent, Result, debug_warn, err, implement,
@@ -31,7 +28,7 @@ pub(super) async fn fetch_prev(
 	initial_set: Vec<OwnedEventId>,
 ) -> Result<(
 	Vec<OwnedEventId>,
-	HashMap<OwnedEventId, (Arc<PduEvent>, BTreeMap<String, CanonicalJsonValue>)>,
+	HashMap<OwnedEventId, (PduEvent, BTreeMap<String, CanonicalJsonValue>)>,
 )> {
 	let mut graph: HashMap<OwnedEventId, _> = HashMap::with_capacity(initial_set.len());
 	let mut eventid_info = HashMap::new();

src/service/rooms/event_handler/handle_outlier_pdu.rs

@@ -1,12 +1,9 @@
-use std::{
-	collections::{BTreeMap, HashMap, hash_map},
-	sync::Arc,
-};
+use std::collections::{BTreeMap, HashMap, hash_map};
 
 use conduwuit::{
 	Err, Error, PduEvent, Result, debug, debug_info, err, implement, state_res, trace, warn,
 };
-use futures::{TryFutureExt, future::ready};
+use futures::future::ready;
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, EventId, RoomId, ServerName,
 	api::client::error::ErrorKind, events::StateEventType,
@@ -24,7 +21,7 @@ pub(super) async fn handle_outlier_pdu<'a>(
 	room_id: &'a RoomId,
 	mut value: CanonicalJsonObject,
 	auth_events_known: bool,
-) -> Result<(Arc<PduEvent>, BTreeMap<String, CanonicalJsonValue>)> {
+) -> Result<(PduEvent, BTreeMap<String, CanonicalJsonValue>)> {
 	// 1. Remove unsigned field
 	value.remove("unsigned");
 
@@ -95,7 +92,7 @@ pub(super) async fn handle_outlier_pdu<'a>(
 	// Build map of auth events
 	let mut auth_events = HashMap::with_capacity(incoming_pdu.auth_events.len());
 	for id in &incoming_pdu.auth_events {
-		let Ok(auth_event) = self.services.timeline.get_pdu(id).map_ok(Arc::new).await else {
+		let Ok(auth_event) = self.services.timeline.get_pdu(id).await else {
 			warn!("Could not find auth event {id}");
 			continue;
 		};
@@ -123,15 +120,10 @@ pub(super) async fn handle_outlier_pdu<'a>(
 
 	// The original create event must be in the auth events
 	if !matches!(
-		auth_events
-			.get(&(StateEventType::RoomCreate, String::new().into()))
-			.map(AsRef::as_ref),
+		auth_events.get(&(StateEventType::RoomCreate, String::new().into())),
 		Some(_) | None
 	) {
-		return Err(Error::BadRequest(
-			ErrorKind::InvalidParam,
-			"Incoming event refers to wrong create event.",
-		));
+		return Err!(Request(InvalidParam("Incoming event refers to wrong create event.")));
 	}
 
 	let state_fetch = |ty: &StateEventType, sk: &str| {
@@ -161,5 +153,5 @@ pub(super) async fn handle_outlier_pdu<'a>(
 
 	trace!("Added pdu as outlier.");
 
-	Ok((Arc::new(incoming_pdu), val))
+	Ok((incoming_pdu, val))
 }

src/service/rooms/event_handler/handle_prev_pdu.rs

@@ -1,6 +1,5 @@
 use std::{
 	collections::{BTreeMap, HashMap},
-	sync::Arc,
 	time::Instant,
 };
 
@@ -24,10 +23,7 @@ pub(super) async fn handle_prev_pdu<'a>(
 	origin: &'a ServerName,
 	event_id: &'a EventId,
 	room_id: &'a RoomId,
-	eventid_info: &mut HashMap<
-		OwnedEventId,
-		(Arc<PduEvent>, BTreeMap<String, CanonicalJsonValue>),
-	>,
+	eventid_info: &mut HashMap<OwnedEventId, (PduEvent, BTreeMap<String, CanonicalJsonValue>)>,
 	create_event: &PduEvent,
 	first_ts_in_room: UInt,
 	prev_id: &EventId,

src/service/rooms/event_handler/state_at_incoming.rs

@@ -2,7 +2,6 @@ use std::{
 	borrow::Borrow,
 	collections::{HashMap, HashSet},
 	iter::Iterator,
-	sync::Arc,
 };
 
 use conduwuit::{
@@ -20,7 +19,7 @@ use crate::rooms::short::ShortStateHash;
 #[tracing::instrument(name = "state", level = "debug", skip_all)]
 pub(super) async fn state_at_incoming_degree_one(
 	&self,
-	incoming_pdu: &Arc<PduEvent>,
+	incoming_pdu: &PduEvent,
 ) -> Result<Option<HashMap<u64, OwnedEventId>>> {
 	let prev_event = &incoming_pdu.prev_events[0];
 	let Ok(prev_event_sstatehash) = self
@@ -67,7 +66,7 @@ pub(super) async fn state_at_incoming_degree_one(
 #[tracing::instrument(name = "state", level = "debug", skip_all)]
 pub(super) async fn state_at_incoming_resolved(
 	&self,
-	incoming_pdu: &Arc<PduEvent>,
+	incoming_pdu: &PduEvent,
 	room_id: &RoomId,
 	room_version_id: &RoomVersionId,
 ) -> Result<Option<HashMap<u64, OwnedEventId>>> {

src/service/rooms/event_handler/upgrade_outlier_pdu.rs

@@ -18,7 +18,7 @@ use crate::rooms::{
 #[implement(super::Service)]
 pub(super) async fn upgrade_outlier_to_timeline_pdu(
 	&self,
-	incoming_pdu: Arc<PduEvent>,
+	incoming_pdu: PduEvent,
 	val: BTreeMap<String, CanonicalJsonValue>,
 	create_event: &PduEvent,
 	origin: &ServerName,