From 8b708d4c4170c68492ad1b3e7f37224368c09fba Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Mon, 24 Jul 2017 13:59:33 +0100
Subject: [PATCH] Use gomatrixserverlib method

---
 .../dendrite/syncapi/consumers/roomserver.go  | 21 +------------------
 .../dendrite/syncapi/storage/syncserver.go    |  2 --
 2 files changed, 1 insertion(+), 22 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 8a62889d7..c5101d71a 100644
--- a/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
@@ -226,18 +226,6 @@ func (s *OutputRoomEvent) updateMemberEvent(
 		return event, nil
 	}
 
-	builder := gomatrixserverlib.EventBuilder{
-		Sender:     event.Sender(),
-		RoomID:     event.RoomID(),
-		Type:       event.Type(),
-		StateKey:   event.StateKey(),
-		PrevEvents: event.PrevEvents(),
-		AuthEvents: event.AuthEvents(),
-		Redacts:    event.Redacts(),
-		Depth:      event.Depth(),
-		Content:    event.Content(),
-	}
-
 	var content events.MemberContent
 	if err := json.Unmarshal(prevEvent.Content(), &content); err != nil {
 		return event, err
@@ -249,14 +237,7 @@ func (s *OutputRoomEvent) updateMemberEvent(
 		UserID:      prevEvent.Sender(),
 	}
 
-	if err = builder.SetUnsigned(prev); err != nil {
-		return event, err
-	}
-
-	ts := event.OriginServerTS().Time()
-	ev, err := builder.Build(event.EventID(), ts, event.Origin(), keyID, privateKey)
-
-	return ev, err
+	return event.SetUnsigned(prev)
 }
 
 func missingEventsFrom(events []gomatrixserverlib.Event, required []string) []string {
diff --git a/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
index b7a3eea64..b5283f073 100644
--- a/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
@@ -100,8 +100,6 @@ func (d *SyncServerDatabase) WriteEvent(
 		}
 		streamPos = types.StreamPosition(pos)
 
-		fmt.Println(len(addStateEvents))
-
 		if len(addStateEvents) == 0 {
 			// If the event is a m.room.member event, and has unsigned content,
 			// we need to save it as it is very likely to be a membership update