Implement gomatrixserverlib.HeaderedEvent in roomserver Kafka output (#914)

* Use Event.Headered

* Use HeaderedEvent in roomserver kafka output

* Fix syncserver-integration-tests

* Update producers to roomserver inputs

* Update gomatrixserverlib

* Update gomatrixserverlib

* Update gomatrixserverlib

* Update gomatrixserverlib

* Update gomatrixserverlib

* Update gomatrixserverlib

clientapi/consumers/roomserver.go

@@ -91,7 +91,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
 		"type":     ev.Type(),
 	}).Info("received event from roomserver")
 
-	events, err := s.lookupStateEvents(output.NewRoomEvent.AddsStateEventIDs, ev)
+	events, err := s.lookupStateEvents(output.NewRoomEvent.AddsStateEventIDs, ev.Event)
 	if err != nil {
 		return err
 	}

clientapi/producers/roomserver.go

@@ -40,9 +40,11 @@ func (c *RoomserverProducer) SendEvents(
 ) (string, error) {
 	ires := make([]api.InputRoomEvent, len(events))
 	for i, event := range events {
+		roomVersion := gomatrixserverlib.RoomVersionV1
+
 		ires[i] = api.InputRoomEvent{
 			Kind:          api.KindNew,
-			Event:         event,
+			Event:         event.Headered(roomVersion),
 			AuthEventIDs:  event.AuthEventIDs(),
 			SendAsServer:  string(sendAsServer),
 			TransactionID: txnID,
@@ -61,11 +63,14 @@ func (c *RoomserverProducer) SendEventWithState(
 		return err
 	}
 
+	// TODO: Room version here
+	roomVersion := gomatrixserverlib.RoomVersionV1
+
 	ires := make([]api.InputRoomEvent, len(outliers)+1)
 	for i, outlier := range outliers {
 		ires[i] = api.InputRoomEvent{
 			Kind:         api.KindOutlier,
-			Event:        outlier,
+			Event:        outlier.Headered(roomVersion),
 			AuthEventIDs: outlier.AuthEventIDs(),
 		}
 	}
@@ -77,7 +82,7 @@ func (c *RoomserverProducer) SendEventWithState(
 
 	ires[len(outliers)] = api.InputRoomEvent{
 		Kind:          api.KindNew,
-		Event:         event,
+		Event:         event.Headered(roomVersion),
 		AuthEventIDs:  event.AuthEventIDs(),
 		HasState:      true,
 		StateEventIDs: stateEventIDs,
@@ -104,8 +109,13 @@ func (c *RoomserverProducer) SendInputRoomEvents(
 func (c *RoomserverProducer) SendInvite(
 	ctx context.Context, inviteEvent gomatrixserverlib.Event,
 ) error {
+	// TODO: Room version here
+	roomVersion := gomatrixserverlib.RoomVersionV1
+
 	request := api.InputRoomEventsRequest{
-		InputInviteEvents: []api.InputInviteEvent{{Event: inviteEvent}},
+		InputInviteEvents: []api.InputInviteEvent{{
+			Event: inviteEvent.Headered(roomVersion),
+		}},
 	}
 	var response api.InputRoomEventsResponse
 	return c.InputAPI.InputRoomEvents(ctx, &request, &response)

clientapi/routing/createroom.go

@@ -180,7 +180,8 @@ func createRoom(
 	}
 
 	r.CreationContent["creator"] = userID
-	r.CreationContent["room_version"] = "1" // TODO: We set this to 1 before we support Room versioning
+	// TODO: Room version here
+	r.CreationContent["room_version"] = gomatrixserverlib.RoomVersionV1
 
 	// TODO: visibility/presets/raw initial state
 	// TODO: Create room alias association