hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-07-29 12:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix keyring regressions in previous P2P demo

Browse source
This commit is contained in:
Neil Alexander 2021-12-13 13:24:49 +00:00
parent c3dda0779d
commit 3113210f17
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
17 changed files with 71 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/dendrite-monolith-server/main.go
View file

@ -91,7 +91,7 @@ func main() {
}
fsAPI := federationapi.NewInternalAPI(
base, federation, rsAPI, base.Caches, false,
base, federation, rsAPI, base.Caches, nil, false,
)
if base.UseHTTPAPIs {
federationapi.AddInternalRoutes(base.InternalAPIMux, fsAPI)
@ -101,7 +101,7 @@ func main() {
// The underlying roomserver implementation needs to be able to call the fedsender.
// This is different to rsAPI which can be the http client which doesn't need this dependency
rsImpl.SetFederationAPI(fsAPI)
rsImpl.SetFederationAPI(fsAPI, keyRing)
keyImpl := keyserver.NewInternalAPI(base, &base.Cfg.KeyServer, fsAPI)
keyAPI := keyImpl
@ -134,7 +134,7 @@ func main() {
// The underlying roomserver implementation needs to be able to call the fedsender.
// This is different to rsAPI which can be the http client which doesn't need this
// dependency. Other components also need updating after their dependencies are up.
rsImpl.SetFederationAPI(fsAPI)
rsImpl.SetFederationAPI(fsAPI, keyRing)
rsImpl.SetAppserviceAPI(asAPI)
keyImpl.SetUserAPI(userAPI)