aboutsummaryrefslogtreecommitdiff
path: root/build/gobind-pinecone
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2021-12-13 13:24:49 +0000
committerNeil Alexander <neilalexander@users.noreply.github.com>2021-12-13 13:24:49 +0000
commit3113210f17221240397796d90879c50b1581316a (patch)
tree68cf1bd630b2b40783025ff43cc9718e25a1d3d9 /build/gobind-pinecone
parentc3dda0779d5cc176ae6c2213f5321f876fa22a99 (diff)
Fix keyring regressions in previous P2P demo
Diffstat (limited to 'build/gobind-pinecone')
-rw-r--r--build/gobind-pinecone/monolith.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go
index 9c739db3..1f7a889d 100644
--- a/build/gobind-pinecone/monolith.go
+++ b/build/gobind-pinecone/monolith.go
@@ -310,7 +310,7 @@ func (m *DendriteMonolith) Start() {
rsAPI := roomserver.NewInternalAPI(base)
fsAPI := federationapi.NewInternalAPI(
- base, federation, rsAPI, base.Caches, true,
+ base, federation, rsAPI, base.Caches, keyRing, true,
)
keyAPI := keyserver.NewInternalAPI(base, &base.Cfg.KeyServer, fsAPI)
@@ -325,8 +325,7 @@ func (m *DendriteMonolith) Start() {
// 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
- rsAPI.SetFederationAPI(fsAPI)
- rsAPI.SetKeyring(keyRing)
+ rsAPI.SetFederationAPI(fsAPI, keyRing)
monolith := setup.Monolith{
Config: base.Cfg,