aboutsummaryrefslogtreecommitdiff
path: root/cmd/dendrite-demo-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 /cmd/dendrite-demo-pinecone
parentc3dda0779d5cc176ae6c2213f5321f876fa22a99 (diff)
Fix keyring regressions in previous P2P demo
Diffstat (limited to 'cmd/dendrite-demo-pinecone')
-rw-r--r--cmd/dendrite-demo-pinecone/main.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go
index cc7238ea..180f8ae0 100644
--- a/cmd/dendrite-demo-pinecone/main.go
+++ b/cmd/dendrite-demo-pinecone/main.go
@@ -185,7 +185,7 @@ func main() {
rsComponent := roomserver.NewInternalAPI(base)
rsAPI := rsComponent
fsAPI := federationapi.NewInternalAPI(
- base, federation, rsAPI, base.Caches, true,
+ base, federation, rsAPI, base.Caches, keyRing, true,
)
keyAPI := keyserver.NewInternalAPI(base, &base.Cfg.KeyServer, fsAPI)
@@ -198,8 +198,7 @@ func main() {
asAPI := appservice.NewInternalAPI(base, userAPI, rsAPI)
- rsComponent.SetFederationAPI(fsAPI)
- rsComponent.SetKeyring(keyRing)
+ rsComponent.SetFederationAPI(fsAPI, keyRing)
monolith := setup.Monolith{
Config: base.Cfg,