mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-20 21:33:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Review comments

Browse source
This commit is contained in:
Neil Alexander 2020-05-27 09:41:04 +01:00
parent f7b981be7c
commit 28520143ff
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/config/config.go
View file

@ -622,6 +622,7 @@ func (config *Dendrite) checkListen(configErrs *configErrors) {
checkNotEmpty(configErrs, "listen.sync_api", string(config.Listen.SyncAPI)) checkNotEmpty(configErrs, "listen.sync_api", string(config.Listen.SyncAPI))
checkNotEmpty(configErrs, "listen.room_server", string(config.Listen.RoomServer)) checkNotEmpty(configErrs, "listen.room_server", string(config.Listen.RoomServer))
checkNotEmpty(configErrs, "listen.edu_server", string(config.Listen.EDUServer)) checkNotEmpty(configErrs, "listen.edu_server", string(config.Listen.EDUServer))
checkNotEmpty(configErrs, "listen.server_key_api", string(config.Listen.EDUServer))
} }
// checkLogging verifies the parameters logging.* are valid. // checkLogging verifies the parameters logging.* are valid.

4
serverkeyapi/api/http.go
View file

@ -10,10 +10,10 @@ import (
) )
const ( const (
// RoomserverPerformJoinPath is the HTTP path for the PerformJoin API. // ServerKeyInputPublicKeyPath is the HTTP path for the InputPublicKeys API.
ServerKeyInputPublicKeyPath = "/serverkeyapi/inputPublicKey" ServerKeyInputPublicKeyPath = "/serverkeyapi/inputPublicKey"
// RoomserverPerformLeavePath is the HTTP path for the PerformLeave API. // ServerKeyQueryPublicKeyPath is the HTTP path for the QueryPublicKeys API.
ServerKeyQueryPublicKeyPath = "/serverkeyapi/queryPublicKey" ServerKeyQueryPublicKeyPath = "/serverkeyapi/queryPublicKey"
) )

2
serverkeyapi/internal/api.go
View file

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"github.com/matrix-org/dendrite/internal/caching" "github.com/matrix-org/dendrite/internal/caching"
"github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/serverkeyapi/api" "github.com/matrix-org/dendrite/serverkeyapi/api"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
) )
@ -13,7 +12,6 @@ import (
type ServerKeyAPI struct { type ServerKeyAPI struct {
api.ServerKeyInternalAPI api.ServerKeyInternalAPI
Cfg *config.Dendrite
ImmutableCache caching.ImmutableCache ImmutableCache caching.ImmutableCache
OurKeyRing gomatrixserverlib.KeyRing OurKeyRing gomatrixserverlib.KeyRing
FedClient *gomatrixserverlib.FederationClient FedClient *gomatrixserverlib.FederationClient

1
serverkeyapi/serverkeyapi.go
View file

@ -34,7 +34,6 @@ func SetupServerKeyAPIComponent(
} }
internalAPI := internal.ServerKeyAPI{ internalAPI := internal.ServerKeyAPI{
Cfg: base.Cfg,
ImmutableCache: base.ImmutableCache, ImmutableCache: base.ImmutableCache,
FedClient: fedClient, FedClient: fedClient,
OurKeyRing: gomatrixserverlib.KeyRing{ OurKeyRing: gomatrixserverlib.KeyRing{