chore: Merge resolver service into client service

src/service/federation/execute.rs

@@ -133,7 +133,7 @@ impl super::Service {
 
 		let actual = self
 			.services
-			.resolver
+			.client
 			.resolver
 			.resolve_server(dest.as_str())
 			.await?;

src/service/federation/mod.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 use conduwuit::{Result, Server};
 pub(crate) use execute::FederationPathBuilderInput;
 
-use crate::{Dep, client, moderation, resolver, server_keys};
+use crate::{Dep, client, moderation, server_keys};
 
 pub struct Service {
 	services: Services,
@@ -13,7 +13,6 @@ pub struct Service {
 struct Services {
 	server: Arc<Server>,
 	client: Dep<client::Service>,
-	resolver: Dep<resolver::Service>,
 	server_keys: Dep<server_keys::Service>,
 	moderation: Dep<moderation::Service>,
 }
@@ -24,7 +23,6 @@ impl crate::Service for Service {
 			services: Services {
 				server: args.server.clone(),
 				client: args.depend::<client::Service>("client"),
-				resolver: args.depend::<resolver::Service>("resolver"),
 				server_keys: args.depend::<server_keys::Service>("server_keys"),
 				moderation: args.depend::<moderation::Service>("moderation"),
 			},