Remove clientapi producers which aren't actually producers (#1111)

* Remove clientapi producers which aren't actually producers

They are actually just convenience wrappers around the internal APIs
for roomserver/eduserver. Move their logic to their respective `api`
packages and call them directly.

* Remove TODO

* unbreak ygg

1 files changed, 7 insertions, 9 deletions

diff --git a/federationapi/routing/send_test.go b/federationapi/routing/send_test.go
index 3e28a347..b81f1c00 100644
--- a/federationapi/routing/send_test.go
+++ b/federationapi/routing/send_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/matrix-org/dendrite/clientapi/producers"
 	eduAPI "github.com/matrix-org/dendrite/eduserver/api"
 	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/dendrite/roomserver/api"
@@ -339,14 +338,13 @@ func (c *txnFedClient) LookupMissingEvents(ctx context.Context, s gomatrixserver
 
 func mustCreateTransaction(rsAPI api.RoomserverInternalAPI, fedClient txnFederationClient, pdus []json.RawMessage) *txnReq {
 	t := &txnReq{
-		context:     context.Background(),
-		rsAPI:       rsAPI,
-		producer:    producers.NewRoomserverProducer(rsAPI),
-		eduProducer: producers.NewEDUServerProducer(&testEDUProducer{}),
-		keys:        &testNopJSONVerifier{},
-		federation:  fedClient,
-		haveEvents:  make(map[string]*gomatrixserverlib.HeaderedEvent),
-		newEvents:   make(map[string]bool),
+		context:    context.Background(),
+		rsAPI:      rsAPI,
+		eduAPI:     &testEDUProducer{},
+		keys:       &testNopJSONVerifier{},
+		federation: fedClient,
+		haveEvents: make(map[string]*gomatrixserverlib.HeaderedEvent),
+		newEvents:  make(map[string]bool),
 	}
 	t.PDUs = pdus
 	t.Origin = testOrigin