mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 19:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add comments to ResolveConflictsAdhoc

Browse source
This commit is contained in:
Neil Alexander 2020-04-03 18:11:05 +01:00
parent 3c09885488
commit 5b38d555c4
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roomserver/state/state.go
View file

@ -681,6 +681,12 @@ func (v StateResolution) calculateStateAfterManyEvents(
return return
} }
// ResolveConflictsAdhoc is a helper function to assist the query API in
// performing state resolution when requested. This is a different code
// path to the rest of state.go because this assumes you already have
// gomatrixserverlib.Event objects and not just a bunch of NIDs like
// elsewhere in the state resolution.
// TODO: Some of this can possibly be deduplicated
func ResolveConflictsAdhoc( func ResolveConflictsAdhoc(
version gomatrixserverlib.RoomVersion, version gomatrixserverlib.RoomVersion,
events []gomatrixserverlib.Event, events []gomatrixserverlib.Event,
@ -720,6 +726,7 @@ func ResolveConflictsAdhoc(
resolved = gomatrixserverlib.ResolveStateConflicts(conflicted, authEvents) resolved = gomatrixserverlib.ResolveStateConflicts(conflicted, authEvents)
resolved = append(resolved, notConflicted...) resolved = append(resolved, notConflicted...)
case gomatrixserverlib.StateResV2: case gomatrixserverlib.StateResV2:
// TODO: auth difference here?
resolved = gomatrixserverlib.ResolveStateConflictsV2(conflicted, notConflicted, authEvents, authEvents) resolved = gomatrixserverlib.ResolveStateConflictsV2(conflicted, notConflicted, authEvents, authEvents)
default: default:
return nil, errors.New("unsupported state resolution algorithm") return nil, errors.New("unsupported state resolution algorithm")