diff options
| author | Kegsay <kegan@matrix.org> | 2020-06-10 16:54:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 16:54:43 +0100 |
| commit | 399b6ae334fe2559d8d141ba42ff6ff960887993 (patch) | |
| tree | 3baa623beccdcc900f315b1aa620019f6a813c2d /federationsender/internal/api.go | |
| parent | 3b4be900000cc79bba4a0d98295b4afe9afea116 (diff) | |
Remove federationsender producer, which in fact was not a producer (#1115)
* Remove federationsender producer, which in fact was not a producer
* Set the signing struct
Diffstat (limited to 'federationsender/internal/api.go')
| -rw-r--r-- | federationsender/internal/api.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/federationsender/internal/api.go b/federationsender/internal/api.go index c2ea0d41..0dca32fc 100644 --- a/federationsender/internal/api.go +++ b/federationsender/internal/api.go @@ -1,22 +1,20 @@ package internal import ( - "github.com/matrix-org/dendrite/federationsender/api" - "github.com/matrix-org/dendrite/federationsender/producers" "github.com/matrix-org/dendrite/federationsender/queue" "github.com/matrix-org/dendrite/federationsender/storage" "github.com/matrix-org/dendrite/federationsender/types" "github.com/matrix-org/dendrite/internal/config" + "github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" ) // FederationSenderInternalAPI is an implementation of api.FederationSenderInternalAPI type FederationSenderInternalAPI struct { - api.FederationSenderInternalAPI db storage.Database cfg *config.Dendrite statistics *types.Statistics - producer *producers.RoomserverProducer + rsAPI api.RoomserverInternalAPI federation *gomatrixserverlib.FederationClient keyRing *gomatrixserverlib.KeyRing queues *queue.OutgoingQueues @@ -24,7 +22,7 @@ type FederationSenderInternalAPI struct { func NewFederationSenderInternalAPI( db storage.Database, cfg *config.Dendrite, - producer *producers.RoomserverProducer, + rsAPI api.RoomserverInternalAPI, federation *gomatrixserverlib.FederationClient, keyRing *gomatrixserverlib.KeyRing, statistics *types.Statistics, @@ -33,7 +31,7 @@ func NewFederationSenderInternalAPI( return &FederationSenderInternalAPI{ db: db, cfg: cfg, - producer: producer, + rsAPI: rsAPI, federation: federation, keyRing: keyRing, statistics: statistics, |