mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use EventID as SHA256

Browse source
This commit is contained in:
Till Faelligen 2023-05-17 11:29:08 +02:00
parent ec5d23005e
commit 97aa5e74d2
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/internal/input/input_events.go
View file

@ -884,7 +884,7 @@ func (r *Inputer) kickGuests(ctx context.Context, event gomatrixserverlib.PDU, r
SendAsServer: string(senderDomain), SendAsServer: string(senderDomain),
}) })
prevEvents = []gomatrixserverlib.EventReference{ prevEvents = []gomatrixserverlib.EventReference{
event.EventReference(), {EventID: event.EventID(), EventSHA256: spec.Base64Bytes(event.EventID())},
} }
} }

8
roomserver/internal/input/input_latest_events.go
View file

@ -154,8 +154,8 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() error {
extremitiesChanged, err := u.calculateLatest( extremitiesChanged, err := u.calculateLatest(
u.oldLatest, u.event, u.oldLatest, u.event,
types.StateAtEventAndReference{ types.StateAtEventAndReference{
EventReference: u.event.EventReference(), EventID: u.event.EventID(),
StateAtEvent: u.stateAtEvent, StateAtEvent: u.stateAtEvent,
}, },
) )
if err != nil { if err != nil {
@ -349,7 +349,7 @@ func (u *latestEventsUpdater) calculateLatest(
// If the "new" event is already referenced by an existing event // If the "new" event is already referenced by an existing event
// then do nothing - it's not a candidate to be a new extremity if // then do nothing - it's not a candidate to be a new extremity if
// it has been referenced. // it has been referenced.
if referenced, err := u.updater.IsReferenced(newEvent.EventReference()); err != nil { if referenced, err := u.updater.IsReferenced(newEvent.EventID()); err != nil {
return false, fmt.Errorf("u.updater.IsReferenced(new): %w", err) return false, fmt.Errorf("u.updater.IsReferenced(new): %w", err)
} else if referenced { } else if referenced {
u.latest = oldLatest u.latest = oldLatest
@ -360,7 +360,7 @@ func (u *latestEventsUpdater) calculateLatest(
// have entries in the previous events table. If they do then we // have entries in the previous events table. If they do then we
// will no longer include them as forward extremities. // will no longer include them as forward extremities.
for k, l := range existingRefs { for k, l := range existingRefs {
referenced, err := u.updater.IsReferenced(l.EventReference) referenced, err := u.updater.IsReferenced(l.EventID)
if err != nil { if err != nil {
return false, fmt.Errorf("u.updater.IsReferenced: %w", err) return false, fmt.Errorf("u.updater.IsReferenced: %w", err)
} else if referenced { } else if referenced {

2
roomserver/internal/perform/perform_admin.go
View file

@ -132,7 +132,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
}) })
affected = append(affected, stateKey) affected = append(affected, stateKey)
prevEvents = []gomatrixserverlib.EventReference{ prevEvents = []gomatrixserverlib.EventReference{
event.EventReference(), {EventID: event.EventID(), EventSHA256: spec.Base64Bytes(event.EventID())},
} }
} }

2
roomserver/internal/perform/perform_upgrade.go
View file

@ -471,7 +471,7 @@ func (r *Upgrader) sendInitialEvents(ctx context.Context, evTime time.Time, user
return fmt.Errorf("failed to set content of new %q event: %w", proto.Type, err) return fmt.Errorf("failed to set content of new %q event: %w", proto.Type, err)
} }
if i > 0 { if i > 0 {
proto.PrevEvents = []gomatrixserverlib.EventReference{builtEvents[i-1].EventReference()} proto.PrevEvents = []gomatrixserverlib.EventReference{{EventID: builtEvents[i-1].EventID(), EventSHA256: spec.Base64Bytes(builtEvents[i-1].EventID())}}
} }
var verImpl gomatrixserverlib.IRoomVersion var verImpl gomatrixserverlib.IRoomVersion

2
roomserver/types/types.go
View file

@ -200,7 +200,7 @@ func (s StateAtEvent) IsStateEvent() bool {
// The StateAtEvent is used to construct the current state of the room from the latest events. // The StateAtEvent is used to construct the current state of the room from the latest events.
type StateAtEventAndReference struct { type StateAtEventAndReference struct {
StateAtEvent StateAtEvent
gomatrixserverlib.EventReference EventID string
} }
type StateAtEventAndReferences []StateAtEventAndReference type StateAtEventAndReferences []StateAtEventAndReference

2
test/room.go
View file

@ -176,7 +176,7 @@ func (r *Room) CreateEvent(t *testing.T, creator *User, eventType string, conten
t.Fatalf("CreateEvent[%s]: failed to SetContent: %s", eventType, err) t.Fatalf("CreateEvent[%s]: failed to SetContent: %s", eventType, err)
} }
if depth > 1 { if depth > 1 {
builder.PrevEvents = []gomatrixserverlib.EventReference{r.events[len(r.events)-1].EventReference()} builder.PrevEvents = []gomatrixserverlib.EventReference{{EventSHA256: spec.Base64Bytes(r.events[len(r.events)-1].EventID()), EventID: r.events[len(r.events)-1].EventID()}}
} }
err = builder.AddAuthEvents(&r.authEvents) err = builder.AddAuthEvents(&r.authEvents)