aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkegsay <kegan@matrix.org>2023-05-02 15:03:16 +0100
committerGitHub <noreply@github.com>2023-05-02 15:03:16 +0100
commitf5b3144dc33ddcb2ab161323d422cab257d04b4c (patch)
tree07d3b03944d2529d96c29674a96c3e76a76ae3b9 /test
parent696cbb70b8cc8d663f7bb7c7a5f25cd57ea6803e (diff)
Use PDU not *Event in HeaderedEvent (#3073)
Requires https://github.com/matrix-org/gomatrixserverlib/pull/376 This has numerous upsides: - Less type casting to `*Event` is required. - Making Dendrite work with `PDU` interfaces means we can swap out Event impls more easily. - Tests which represent weird event shapes are easier to write. Part of a series of refactors on GMSL.
Diffstat (limited to 'test')
-rw-r--r--test/http.go2
-rw-r--r--test/room.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/http.go b/test/http.go
index 8cd83d0a..9a7223b8 100644
--- a/test/http.go
+++ b/test/http.go
@@ -52,7 +52,7 @@ func NewRequest(t *testing.T, method, path string, opts ...HTTPRequestOpt) *http
// ListenAndServe will listen on a random high-numbered port and attach the given router.
// Returns the base URL to send requests to. Call `cancel` to shutdown the server, which will block until it has closed.
func ListenAndServe(t *testing.T, router http.Handler, withTLS bool) (apiURL string, cancel func()) {
- listener, err := net.Listen("tcp", ":0")
+ listener, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatalf("failed to listen: %s", err)
}
diff --git a/test/room.go b/test/room.go
index 140c100e..918123aa 100644
--- a/test/room.go
+++ b/test/room.go
@@ -204,7 +204,7 @@ func (r *Room) CreateEvent(t *testing.T, creator *User, eventType string, conten
if err = gomatrixserverlib.Allowed(ev, &r.authEvents); err != nil {
t.Fatalf("CreateEvent[%s]: failed to verify event was allowed: %s", eventType, err)
}
- headeredEvent := &rstypes.HeaderedEvent{Event: ev}
+ headeredEvent := &rstypes.HeaderedEvent{PDU: ev}
headeredEvent.Visibility = r.visibility
return headeredEvent
}
@@ -215,7 +215,7 @@ func (r *Room) InsertEvent(t *testing.T, he *rstypes.HeaderedEvent) {
// Add the event to the list of auth/state events
r.events = append(r.events, he)
if he.StateKey() != nil {
- err := r.authEvents.AddEvent(he.Event)
+ err := r.authEvents.AddEvent(he.PDU)
if err != nil {
t.Fatalf("InsertEvent: failed to add event to auth events: %s", err)
}