diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-12-13 13:24:49 +0000 |
|---|---|---|
| committer | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-12-13 13:24:49 +0000 |
| commit | 3113210f17221240397796d90879c50b1581316a (patch) | |
| tree | 68cf1bd630b2b40783025ff43cc9718e25a1d3d9 /roomserver/internal | |
| parent | c3dda0779d5cc176ae6c2213f5321f876fa22a99 (diff) | |
Fix keyring regressions in previous P2P demo
Diffstat (limited to 'roomserver/internal')
| -rw-r--r-- | roomserver/internal/api.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/roomserver/internal/api.go b/roomserver/internal/api.go index bda585cf..67bbc7ab 100644 --- a/roomserver/internal/api.go +++ b/roomserver/internal/api.go @@ -73,18 +73,12 @@ func NewRoomserverAPI( return a } -// SetKeyring sets the keyring to a given keyring. This is only useful for the P2P -// demos and must be called after SetFederationSenderInputAPI. -func (r *RoomserverInternalAPI) SetKeyring(keyRing *gomatrixserverlib.KeyRing) { - r.KeyRing = keyRing -} - // SetFederationInputAPI passes in a federation input API reference so that we can // avoid the chicken-and-egg problem of both the roomserver input API and the // federation input API being interdependent. -func (r *RoomserverInternalAPI) SetFederationAPI(fsAPI fsAPI.FederationInternalAPI) { +func (r *RoomserverInternalAPI) SetFederationAPI(fsAPI fsAPI.FederationInternalAPI, keyRing *gomatrixserverlib.KeyRing) { r.fsAPI = fsAPI - r.SetKeyring(fsAPI.KeyRing()) + r.KeyRing = keyRing r.Inviter = &perform.Inviter{ DB: r.DB, |