mirror of
https://github.com/element-hq/dendrite.git
synced 2025-09-13 12:52:24 +03:00
Use ProtoEvent where needed instead of EventBuilder (#3075)
They are fundamentally different concepts, so should be represented as such. Proto events are exchanged in /make_xxx calls over federation, and made as "fledgling" events in /createRoom and general event sending. *Building* events is a reasonably complex VERSION SPECIFIC process which needs amongst other things, auth event providers, prev events, signing keys, etc. Requires https://github.com/matrix-org/gomatrixserverlib/pull/379
This commit is contained in:
parent
d5c11a3c86
commit
2b34f88fde
23 changed files with 152 additions and 119 deletions
|
@ -404,7 +404,7 @@ func mustCreateEvent(t *testing.T, ev fledglingEvent) (result *types.HeaderedEve
|
|||
roomVer := gomatrixserverlib.RoomVersionV9
|
||||
seed := make([]byte, ed25519.SeedSize) // zero seed
|
||||
key := ed25519.NewKeyFromSeed(seed)
|
||||
eb := gomatrixserverlib.EventBuilder{
|
||||
eb := gomatrixserverlib.MustGetRoomVersion(roomVer).NewEventBuilderFromProtoEvent(&gomatrixserverlib.ProtoEvent{
|
||||
Sender: ev.Sender,
|
||||
Type: ev.Type,
|
||||
StateKey: ev.StateKey,
|
||||
|
@ -412,12 +412,13 @@ func mustCreateEvent(t *testing.T, ev fledglingEvent) (result *types.HeaderedEve
|
|||
Redacts: ev.Redacts,
|
||||
Depth: ev.Depth,
|
||||
PrevEvents: ev.PrevEvents,
|
||||
}
|
||||
})
|
||||
err := eb.SetContent(map[string]interface{}{})
|
||||
if err != nil {
|
||||
t.Fatalf("mustCreateEvent: failed to marshal event content %v", err)
|
||||
}
|
||||
signedEvent, err := eb.Build(time.Now(), "localhost", "ed25519:test", key, roomVer)
|
||||
|
||||
signedEvent, err := eb.Build(time.Now(), "localhost", "ed25519:test", key)
|
||||
if err != nil {
|
||||
t.Fatalf("mustCreateEvent: failed to sign event: %s", err)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue