From f61bfdc6afd0b8a039bbcadaa0e2f24e0793314b Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Fri, 28 Jul 2017 17:11:10 +0100
Subject: [PATCH] Clean roomserver consumer

---
 .../dendrite/syncapi/consumers/roomserver.go  | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go b/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
index 13159c87f..5f91e0132 100644
--- a/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
@@ -35,12 +35,9 @@ type OutputRoomEvent struct {
 	db                 *storage.SyncServerDatabase
 	notifier           *sync.Notifier
 	query              api.RoomserverQueryAPI
-	serverName         gomatrixserverlib.ServerName
-	keyID              gomatrixserverlib.KeyID
-	privateKey         []byte
 }
 
-type prevMembership struct {
+type prevEventRef struct {
 	PrevContent json.RawMessage `json:"prev_content"`
 	PrevID      string          `json:"replaces_state"`
 	UserID      string          `json:"prev_sender"`
@@ -64,9 +61,6 @@ func NewOutputRoomEvent(cfg *config.Dendrite, n *sync.Notifier, store *storage.S
 		db:                 store,
 		notifier:           n,
 		query:              api.NewRoomserverQueryAPIHTTP(roomServerURL, nil),
-		serverName:         cfg.Matrix.ServerName,
-		keyID:              cfg.Matrix.KeyID,
-		privateKey:         cfg.Matrix.PrivateKey,
 	}
 	consumer.ProcessMessage = s.onMessage
 
@@ -113,13 +107,13 @@ func (s *OutputRoomEvent) onMessage(msg *sarama.ConsumerMessage) error {
 		}).Panicf("roomserver output log: state event lookup failure")
 	}
 
-	ev, err = s.updateStateEvent(ev, s.keyID, s.privateKey)
+	ev, err = s.updateStateEvent(ev)
 	if err != nil {
 		return err
 	}
 
 	for i := range addsStateEvents {
-		addsStateEvents[i], err = s.updateStateEvent(addsStateEvents[i], s.keyID, s.privateKey)
+		addsStateEvents[i], err = s.updateStateEvent(addsStateEvents[i])
 		if err != nil {
 			return err
 		}
@@ -201,10 +195,7 @@ func (s *OutputRoomEvent) lookupStateEvents(
 	return result, nil
 }
 
-func (s *OutputRoomEvent) updateStateEvent(
-	event gomatrixserverlib.Event, keyID gomatrixserverlib.KeyID,
-	privateKey []byte,
-) (gomatrixserverlib.Event, error) {
+func (s *OutputRoomEvent) updateStateEvent(event gomatrixserverlib.Event) (gomatrixserverlib.Event, error) {
 	var stateKey string
 	if event.StateKey() == nil {
 		stateKey = ""
@@ -221,7 +212,7 @@ func (s *OutputRoomEvent) updateStateEvent(
 		return event, nil
 	}
 
-	prev := prevMembership{
+	prev := prevEventRef{
 		PrevContent: prevEvent.Content(),
 		PrevID:      prevEvent.EventID(),
 		UserID:      prevEvent.Sender(),