From 4ac3e03db1faf9785fa591a505c012b0da25709c Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 27 Mar 2020 15:01:53 +0000
Subject: [PATCH] Move function out of common and into gmsl

---
 common/events.go               | 9 ---------
 federationapi/routing/join.go  | 4 ++--
 federationapi/routing/state.go | 5 ++---
 go.mod                         | 2 +-
 go.sum                         | 2 ++
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/common/events.go b/common/events.go
index 90eef19aa..b79998a73 100644
--- a/common/events.go
+++ b/common/events.go
@@ -124,12 +124,3 @@ func AddPrevEventsToEvent(
 
 	return nil
 }
-
-// RemoveEventHeaders unwraps an array of headered events.
-func RemoveEventHeaders(in []gomatrixserverlib.HeaderedEvent) []gomatrixserverlib.Event {
-	result := make([]gomatrixserverlib.Event, len(in))
-	for i := range in {
-		result[i] = in[i].Event
-	}
-	return result
-}
diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go
index 1c225133e..a39ff6394 100644
--- a/federationapi/routing/join.go
+++ b/federationapi/routing/join.go
@@ -218,8 +218,8 @@ func SendJoin(
 	return util.JSONResponse{
 		Code: http.StatusOK,
 		JSON: map[string]interface{}{
-			"state":      common.RemoveEventHeaders(stateAndAuthChainResponse.StateEvents),
-			"auth_chain": common.RemoveEventHeaders(stateAndAuthChainResponse.AuthChainEvents),
+			"state":      gomatrixserverlib.UnwrapEventHeaders(stateAndAuthChainResponse.StateEvents),
+			"auth_chain": gomatrixserverlib.UnwrapEventHeaders(stateAndAuthChainResponse.AuthChainEvents),
 		},
 	}
 }
diff --git a/federationapi/routing/state.go b/federationapi/routing/state.go
index d0090d7b7..6a47882b7 100644
--- a/federationapi/routing/state.go
+++ b/federationapi/routing/state.go
@@ -18,7 +18,6 @@ import (
 	"net/url"
 
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
-	"github.com/matrix-org/dendrite/common"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
@@ -131,8 +130,8 @@ func getState(
 	}
 
 	return &gomatrixserverlib.RespState{
-		StateEvents: common.RemoveEventHeaders(response.StateEvents),
-		AuthEvents:  common.RemoveEventHeaders(response.AuthChainEvents),
+		StateEvents: gomatrixserverlib.UnwrapEventHeaders(response.StateEvents),
+		AuthEvents:  gomatrixserverlib.UnwrapEventHeaders(response.AuthChainEvents),
 	}, nil
 }
 
diff --git a/go.mod b/go.mod
index 83ba461f4..0a128bd87 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/matrix-org/go-http-js-libp2p v0.0.0-20200318135427-31631a9ef51f
 	github.com/matrix-org/go-sqlite3-js v0.0.0-20200304164012-aa524245b658
 	github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26
-	github.com/matrix-org/gomatrixserverlib v0.0.0-20200327143012-be83dab84222
+	github.com/matrix-org/gomatrixserverlib v0.0.0-20200327150038-7c7eb457f1b4
 	github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1
 	github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7
 	github.com/mattn/go-sqlite3 v2.0.2+incompatible
diff --git a/go.sum b/go.sum
index 38f0b400a..88bff8dcf 100644
--- a/go.sum
+++ b/go.sum
@@ -170,6 +170,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20200327141825-4c04d7773f61 h1:9c
 github.com/matrix-org/gomatrixserverlib v0.0.0-20200327141825-4c04d7773f61/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
 github.com/matrix-org/gomatrixserverlib v0.0.0-20200327143012-be83dab84222 h1:b8u7o03EGemkblBgAvwtpCjVXKwzBZ794uCco/Urv6Y=
 github.com/matrix-org/gomatrixserverlib v0.0.0-20200327143012-be83dab84222/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20200327150038-7c7eb457f1b4 h1:lCdqy980ToVrW74kEZzxqeZIrXJ3rhBrfLPP4l/Vihs=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20200327150038-7c7eb457f1b4/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
 github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 h1:osLoFdOy+ChQqVUn2PeTDETFftVkl4w9t/OW18g3lnk=
 github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1/go.mod h1:cXoYQIENbdWIQHt1SyCo6Bl3C3raHwJ0wgVrXHSqf+A=
 github.com/matrix-org/util v0.0.0-20171127121716-2e2df66af2f5 h1:W7l5CP4V7wPyPb4tYE11dbmeAOwtFQBTW0rf4OonOS8=