diff options
Diffstat (limited to 'cmd/dendritejs')
| -rw-r--r-- | cmd/dendritejs/keyfetcher.go | 5 | ||||
| -rw-r--r-- | cmd/dendritejs/main.go | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cmd/dendritejs/keyfetcher.go b/cmd/dendritejs/keyfetcher.go index ee4905d4..47a81c41 100644 --- a/cmd/dendritejs/keyfetcher.go +++ b/cmd/dendritejs/keyfetcher.go @@ -82,3 +82,8 @@ func (f *libp2pKeyFetcher) FetchKeys( func (f *libp2pKeyFetcher) FetcherName() string { return "libp2pKeyFetcher" } + +// no-op function for storing keys - we don't do any work to fetch them so don't bother storing. +func (f *libp2pKeyFetcher) StoreKeys(ctx context.Context, results map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult) error { + return nil +} diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go index b8517bf9..45f23d9a 100644 --- a/cmd/dendritejs/main.go +++ b/cmd/dendritejs/main.go @@ -37,7 +37,6 @@ import ( "github.com/matrix-org/dendrite/publicroomsapi" "github.com/matrix-org/dendrite/publicroomsapi/storage" "github.com/matrix-org/dendrite/roomserver" - "github.com/matrix-org/dendrite/serverkeyapi" "github.com/matrix-org/dendrite/syncapi" go_http_js_libp2p "github.com/matrix-org/go-http-js-libp2p" "github.com/matrix-org/gomatrixserverlib" @@ -197,14 +196,12 @@ func main() { deviceDB := base.CreateDeviceDB() federation := createFederationClient(cfg, node) - serverKeyAPI := serverkeyapi.SetupServerKeyAPIComponent( - base, federation, - ) + fetcher := &libp2pKeyFetcher{} keyRing := gomatrixserverlib.KeyRing{ KeyFetchers: []gomatrixserverlib.KeyFetcher{ - &libp2pKeyFetcher{}, + fetcher, }, - KeyDatabase: serverKeyAPI, + KeyDatabase: fetcher, } p2pPublicRoomProvider := NewLibP2PPublicRoomsProvider(node) |