diff options
author | Kegsay <kegan@matrix.org> | 2020-06-30 13:34:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-30 13:34:59 +0100 |
commit | 6f49758b90d655d9c2bb9170da2ea1d0a2bdd664 (patch) | |
tree | f434cc48f27c3915fffdb39c5b907fd021d4ff61 /cmd/dendrite-demo-libp2p | |
parent | ca5bbffd8d987b220c8f8eb888a2fc9b9cef104c (diff) |
Remove membership table from account DB (#1172)
* Remove membership table from account DB
And make code which needs that data use the currentstate server
* Unbreak tests; use a membership enum for space
Diffstat (limited to 'cmd/dendrite-demo-libp2p')
-rw-r--r-- | cmd/dendrite-demo-libp2p/main.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go index 356ab5a7..b7e86b77 100644 --- a/cmd/dendrite-demo-libp2p/main.go +++ b/cmd/dendrite-demo-libp2p/main.go @@ -30,6 +30,7 @@ import ( p2pdisc "github.com/libp2p/go-libp2p/p2p/discovery" "github.com/matrix-org/dendrite/appservice" "github.com/matrix-org/dendrite/cmd/dendrite-demo-libp2p/storage" + "github.com/matrix-org/dendrite/currentstateserver" "github.com/matrix-org/dendrite/eduserver" "github.com/matrix-org/dendrite/federationsender" "github.com/matrix-org/dendrite/internal/config" @@ -166,6 +167,7 @@ func main() { if err != nil { logrus.WithError(err).Panicf("failed to connect to public rooms db") } + stateAPI := currentstateserver.NewInternalAPI(base.Base.Cfg, base.Base.KafkaConsumer) monolith := setup.Monolith{ Config: base.Base.Cfg, @@ -182,6 +184,7 @@ func main() { FederationSenderAPI: fsAPI, RoomserverAPI: rsAPI, ServerKeyAPI: serverKeyAPI, + StateAPI: stateAPI, UserAPI: userAPI, PublicRoomsDB: publicRoomsDB, |