From 525845cf434e4ae0d0e66156689d7455b73b0cc3 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 4 Jun 2020 17:46:43 +0100 Subject: [PATCH] cleanup which components need to be made --- cmd/dendrite-client-api-server/main.go | 5 +---- cmd/dendrite-federation-api-server/main.go | 10 ++-------- cmd/dendrite-federation-sender-server/main.go | 3 +-- cmd/dendrite-public-rooms-api-server/main.go | 2 -- roomserver/inthttp/client.go | 6 +----- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/cmd/dendrite-client-api-server/main.go b/cmd/dendrite-client-api-server/main.go index 1304a7fde..8ad4231d1 100644 --- a/cmd/dendrite-client-api-server/main.go +++ b/cmd/dendrite-client-api-server/main.go @@ -16,8 +16,6 @@ package main import ( "github.com/matrix-org/dendrite/clientapi" - "github.com/matrix-org/dendrite/eduserver" - "github.com/matrix-org/dendrite/eduserver/cache" "github.com/matrix-org/dendrite/internal/basecomponent" "github.com/matrix-org/dendrite/internal/transactions" ) @@ -38,8 +36,7 @@ func main() { asQuery := base.AppserviceHTTPClient() rsAPI := base.RoomserverHTTPClient() fsAPI := base.FederationSenderHTTPClient() - rsAPI.SetFederationSenderAPI(fsAPI) - eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New(), deviceDB) + eduInputAPI := base.EDUServerClient() clientapi.SetupClientAPIComponent( base, deviceDB, accountDB, federation, keyRing, diff --git a/cmd/dendrite-federation-api-server/main.go b/cmd/dendrite-federation-api-server/main.go index dec30fe61..0c4d8b854 100644 --- a/cmd/dendrite-federation-api-server/main.go +++ b/cmd/dendrite-federation-api-server/main.go @@ -16,8 +16,6 @@ package main import ( "github.com/matrix-org/dendrite/clientapi/producers" - "github.com/matrix-org/dendrite/eduserver" - "github.com/matrix-org/dendrite/eduserver/cache" "github.com/matrix-org/dendrite/federationapi" "github.com/matrix-org/dendrite/internal/basecomponent" ) @@ -30,17 +28,13 @@ func main() { accountDB := base.CreateAccountsDB() deviceDB := base.CreateDeviceDB() federation := base.CreateFederationClient() - serverKeyAPI := base.ServerKeyAPIClient() keyRing := serverKeyAPI.KeyRing() - fsAPI := base.FederationSenderHTTPClient() - rsAPI := base.RoomserverHTTPClient() asAPI := base.AppserviceHTTPClient() - rsAPI.SetFederationSenderAPI(fsAPI) - eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New(), deviceDB) - eduProducer := producers.NewEDUServerProducer(eduInputAPI) + // TODO: this isn't a producer + eduProducer := producers.NewEDUServerProducer(base.EDUServerClient()) federationapi.SetupFederationAPIComponent( base, accountDB, deviceDB, federation, keyRing, diff --git a/cmd/dendrite-federation-sender-server/main.go b/cmd/dendrite-federation-sender-server/main.go index a1dc7dba7..651eb257f 100644 --- a/cmd/dendrite-federation-sender-server/main.go +++ b/cmd/dendrite-federation-sender-server/main.go @@ -30,10 +30,9 @@ func main() { keyRing := serverKeyAPI.KeyRing() rsAPI := base.RoomserverHTTPClient() - fsAPI := federationsender.SetupFederationSenderComponent( + federationsender.SetupFederationSenderComponent( base, federation, rsAPI, keyRing, ) - rsAPI.SetFederationSenderAPI(fsAPI) base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender), string(base.Cfg.Listen.FederationSender)) diff --git a/cmd/dendrite-public-rooms-api-server/main.go b/cmd/dendrite-public-rooms-api-server/main.go index f5443c194..0cad3670c 100644 --- a/cmd/dendrite-public-rooms-api-server/main.go +++ b/cmd/dendrite-public-rooms-api-server/main.go @@ -28,9 +28,7 @@ func main() { deviceDB := base.CreateDeviceDB() - fsAPI := base.FederationSenderHTTPClient() rsAPI := base.RoomserverHTTPClient() - rsAPI.SetFederationSenderAPI(fsAPI) publicRoomsDB, err := storage.NewPublicRoomsServerDatabase(string(base.Cfg.Database.PublicRoomsAPI), base.Cfg.DbProperties(), cfg.Matrix.ServerName) if err != nil { diff --git a/roomserver/inthttp/client.go b/roomserver/inthttp/client.go index f8f922fbd..99db9e1e7 100644 --- a/roomserver/inthttp/client.go +++ b/roomserver/inthttp/client.go @@ -45,7 +45,6 @@ const ( type httpRoomserverInternalAPI struct { roomserverURL string httpClient *http.Client - fsAPI fsInputAPI.FederationSenderInternalAPI immutableCache caching.ImmutableCache } @@ -66,11 +65,8 @@ func NewRoomserverClient( }, nil } -// SetFederationSenderInputAPI passes in a federation sender input API reference -// so that we can avoid the chicken-and-egg problem of both the roomserver input API -// and the federation sender input API being interdependent. +// SetFederationSenderInputAPI no-ops in HTTP client mode as there is no chicken/egg scenario func (h *httpRoomserverInternalAPI) SetFederationSenderAPI(fsAPI fsInputAPI.FederationSenderInternalAPI) { - h.fsAPI = fsAPI } // SetRoomAlias implements RoomserverAliasAPI