diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-11-24 10:45:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 10:45:23 +0000 |
| commit | ec716793eb86e7723ecfaa356e148334bc3921eb (patch) | |
| tree | 7b9203b5509fe91e1cb255d43895d8acc4658d1e /roomserver/roomserver_test.go | |
| parent | 6e93531e9412a16d39567e141c98b538a7e1e739 (diff) | |
Merge `federationapi`, `federationsender`, `signingkeyserver` components (#2055)
* Initial federation sender -> federation API refactoring
* Move base into own package, avoids import cycle
* Fix build errors
* Fix tests
* Add signing key server tables
* Try to fold signing key server into federation API
* Fix dendritejs builds
* Update embedded interfaces
* Fix panic, fix lint error
* Update configs, docker
* Rename some things
* Reuse same keyring on the implementing side
* Fix federation tests, `NewBaseDendrite` can accept freeform options
* Fix build
* Update create_db, configs
* Name tables back
* Don't rename federationsender consumer for now
Diffstat (limited to 'roomserver/roomserver_test.go')
| -rw-r--r-- | roomserver/roomserver_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/roomserver/roomserver_test.go b/roomserver/roomserver_test.go index 5c954007..8d92d8d8 100644 --- a/roomserver/roomserver_test.go +++ b/roomserver/roomserver_test.go @@ -13,11 +13,10 @@ import ( "github.com/Shopify/sarama" "github.com/matrix-org/dendrite/internal/caching" - "github.com/matrix-org/dendrite/internal/test" "github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/internal" "github.com/matrix-org/dendrite/roomserver/storage" - "github.com/matrix-org/dendrite/setup" + "github.com/matrix-org/dendrite/setup/base" "github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/sirupsen/logrus" @@ -172,7 +171,7 @@ func mustCreateRoomserverAPI(t *testing.T) (api.RoomserverInternalAPI, *dummyPro if err != nil { t.Fatalf("failed to make caches: %s", err) } - base := &setup.BaseDendrite{ + base := &base.BaseDendrite{ Caches: cache, Cfg: cfg, } @@ -182,7 +181,7 @@ func mustCreateRoomserverAPI(t *testing.T) (api.RoomserverInternalAPI, *dummyPro } return internal.NewRoomserverAPI( &cfg.RoomServer, roomserverDB, dp, string(cfg.Global.Kafka.TopicFor(config.TopicOutputRoomEvent)), - base.Caches, &test.NopJSONVerifier{}, nil, + base.Caches, nil, ), dp } |