diff options
author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-11-24 11:57:39 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-24 11:57:39 +0000 |
commit | c9419e51afeb0c8cb39a43bd8a0d0d472347a8a1 (patch) | |
tree | 7b425f81fe82f73c80857799a35d0ad6a004db4a /federationapi | |
parent | ec716793eb86e7723ecfaa356e148334bc3921eb (diff) |
Don't populate config defaults where it doesn't make sense (#2058)
* Don't populate config defaults where it doesn't make sense
* Fix dendritejs builds
Diffstat (limited to 'federationapi')
-rw-r--r-- | federationapi/federationapi_keys_test.go | 2 | ||||
-rw-r--r-- | federationapi/federationapi_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/federationapi/federationapi_keys_test.go b/federationapi/federationapi_keys_test.go index a0051e19..fb4307aa 100644 --- a/federationapi/federationapi_keys_test.go +++ b/federationapi/federationapi_keys_test.go @@ -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.Kafka.UseNaffka = true diff --git a/federationapi/federationapi_test.go b/federationapi/federationapi_test.go index 0c5ee740..8b5bdd03 100644 --- a/federationapi/federationapi_test.go +++ b/federationapi/federationapi_test.go @@ -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 |