mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 05:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix federation API test

Browse source
This commit is contained in:
Neil Alexander 2020-06-16 12:09:00 +01:00
parent 3d8d9ed50f
commit aae7c86fda
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
federationapi/federationapi.go
View file

@ -35,7 +35,7 @@ func AddPublicRoutes(
accountsDB accounts.Database, accountsDB accounts.Database,
deviceDB devices.Database, deviceDB devices.Database,
federation *gomatrixserverlib.FederationClient, federation *gomatrixserverlib.FederationClient,
keyRing *gomatrixserverlib.KeyRing, keyRing gomatrixserverlib.JSONVerifier,
rsAPI roomserverAPI.RoomserverInternalAPI, rsAPI roomserverAPI.RoomserverInternalAPI,
asAPI appserviceAPI.AppServiceQueryAPI, asAPI appserviceAPI.AppServiceQueryAPI,
federationSenderAPI federationSenderAPI.FederationSenderInternalAPI, federationSenderAPI federationSenderAPI.FederationSenderInternalAPI,
@ -44,7 +44,7 @@ func AddPublicRoutes(
routing.Setup( routing.Setup(
router, cfg, rsAPI, asAPI, router, cfg, rsAPI, asAPI,
eduAPI, federationSenderAPI, *keyRing, eduAPI, federationSenderAPI, keyRing,
federation, accountsDB, deviceDB, federation, accountsDB, deviceDB,
) )
} }

4
federationapi/federationapi_test.go
View file

@ -27,11 +27,11 @@ func TestRoomsV3URLEscapeDoNot404(t *testing.T) {
cfg.Database.Naffka = "file::memory:" cfg.Database.Naffka = "file::memory:"
cfg.SetDefaults() cfg.SetDefaults()
base := setup.NewBaseDendrite(cfg, "Test", false) base := setup.NewBaseDendrite(cfg, "Test", false)
keyRing := &test.NopJSONVerifier{}
fsAPI := base.FederationSenderHTTPClient() fsAPI := base.FederationSenderHTTPClient()
skAPI := base.ServerKeyAPIClient()
// TODO: This is pretty fragile, as if anything calls anything on these nils this test will break. // TODO: This is pretty fragile, as if anything calls anything on these nils this test will break.
// Unfortunately, it makes little sense to instantiate these dependencies when we just want to test routing. // Unfortunately, it makes little sense to instantiate these dependencies when we just want to test routing.
federationapi.AddPublicRoutes(base.PublicAPIMux, cfg, nil, nil, nil, skAPI, nil, nil, fsAPI, nil) federationapi.AddPublicRoutes(base.PublicAPIMux, cfg, nil, nil, nil, keyRing, nil, nil, fsAPI, nil)
httputil.SetupHTTPAPI( httputil.SetupHTTPAPI(
base.BaseMux, base.BaseMux,
base.PublicAPIMux, base.PublicAPIMux,

2
federationapi/routing/routing.go
View file

@ -51,7 +51,7 @@ func Setup(
asAPI appserviceAPI.AppServiceQueryAPI, asAPI appserviceAPI.AppServiceQueryAPI,
eduAPI eduserverAPI.EDUServerInputAPI, eduAPI eduserverAPI.EDUServerInputAPI,
fsAPI federationSenderAPI.FederationSenderInternalAPI, fsAPI federationSenderAPI.FederationSenderInternalAPI,
keys gomatrixserverlib.KeyRing, keys gomatrixserverlib.JSONVerifier,
federation *gomatrixserverlib.FederationClient, federation *gomatrixserverlib.FederationClient,
accountDB accounts.Database, accountDB accounts.Database,
deviceDB devices.Database, deviceDB devices.Database,