diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-02-18 11:31:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-18 11:31:05 +0000 |
| commit | 153bfbbea579dfa10e8e804036f17c1a33b6fe80 (patch) | |
| tree | e135dcefc59618d7b86cd8687c1a2a304385ce45 /setup/monolith.go | |
| parent | 0a7dea44505f703af1e7e069602ca95aa5a83700 (diff) | |
Merge both user API databases into one (#2186)
* Merge user API databases into one
* Remove DeviceDatabase from config
* Fix tests
* Try that again
* Clean up keyserver device keys when the devices no longer exist in the user API
* Tweak ordering
* Fix UserExists flag, device check
* Allow including empty entries so we can clean them up
* Remove logging
Diffstat (limited to 'setup/monolith.go')
| -rw-r--r-- | setup/monolith.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setup/monolith.go b/setup/monolith.go index e6c95522..61125e4a 100644 --- a/setup/monolith.go +++ b/setup/monolith.go @@ -30,7 +30,7 @@ import ( "github.com/matrix-org/dendrite/setup/process" "github.com/matrix-org/dendrite/syncapi" userapi "github.com/matrix-org/dendrite/userapi/api" - "github.com/matrix-org/dendrite/userapi/storage/accounts" + userdb "github.com/matrix-org/dendrite/userapi/storage" "github.com/matrix-org/gomatrixserverlib" ) @@ -38,7 +38,7 @@ import ( // all components of Dendrite, for use in monolith mode. type Monolith struct { Config *config.Dendrite - AccountDB accounts.Database + AccountDB userdb.Database KeyRing *gomatrixserverlib.KeyRing Client *gomatrixserverlib.Client FedClient *gomatrixserverlib.FederationClient |