hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 06:12:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into nats

Browse source
This commit is contained in:
Neil Alexander 2021-11-24 12:04:32 +00:00
commit 95476d36ca
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
28 changed files with 489 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
federationapi/federationapi_keys_test.go
View file

@ -71,7 +71,7 @@ func TestMain(m *testing.M) {
// Draw up just enough Dendrite config for the server key
// API to work.
cfg := &config.Dendrite{}
cfg.Defaults()
cfg.Defaults(true)
cfg.Global.ServerName = gomatrixserverlib.ServerName(s.name)
cfg.Global.PrivateKey = testPriv
cfg.Global.JetStream.InMemory = true

2
federationapi/federationapi_test.go
View file

@ -19,7 +19,7 @@ import (
func TestRoomsV3URLEscapeDoNot404(t *testing.T) {
_, privKey, _ := ed25519.GenerateKey(nil)
cfg := &config.Dendrite{}
cfg.Defaults()
cfg.Defaults(true)
cfg.Global.KeyID = gomatrixserverlib.KeyID("ed25519:auto")
cfg.Global.ServerName = gomatrixserverlib.ServerName("localhost")
cfg.Global.PrivateKey = privKey