From f6b1861c408ca9c3df22721805fa61ccf50a6144 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 19 Mar 2020 18:06:37 +0000 Subject: [PATCH] Rename Prepare to NewStateResolution --- roomserver/input/events.go | 2 +- roomserver/input/latest_events.go | 2 +- roomserver/query/query.go | 10 +++++----- roomserver/state/shared/shared.go | 1 + roomserver/state/state.go | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 roomserver/state/shared/shared.go diff --git a/roomserver/input/events.go b/roomserver/input/events.go index 6502b6432..ab2bbe1cd 100644 --- a/roomserver/input/events.go +++ b/roomserver/input/events.go @@ -157,7 +157,7 @@ func calculateAndSetState( event gomatrixserverlib.Event, ) error { var err error - roomState := state.Prepare(db) + roomState := state.NewStateResolution(db) if input.HasState { // We've been told what the state at the event is so we don't need to calculate it. diff --git a/roomserver/input/latest_events.go b/roomserver/input/latest_events.go index 04d2b81c4..525a6f518 100644 --- a/roomserver/input/latest_events.go +++ b/roomserver/input/latest_events.go @@ -178,7 +178,7 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() error { func (u *latestEventsUpdater) latestState() error { var err error - roomState := state.Prepare(u.db) + roomState := state.NewStateResolution(u.db) latestStateAtEvents := make([]types.StateAtEvent, len(u.latest)) for i := range u.latest { diff --git a/roomserver/query/query.go b/roomserver/query/query.go index 94f8d97fe..2638919ad 100644 --- a/roomserver/query/query.go +++ b/roomserver/query/query.go @@ -112,7 +112,7 @@ func (r *RoomserverQueryAPI) QueryLatestEventsAndState( return nil } - roomState := state.Prepare(r.DB) + roomState := state.NewStateResolution(r.DB) response.QueryLatestEventsAndStateRequest = *request roomNID, err := r.DB.RoomNID(ctx, request.RoomID) @@ -163,7 +163,7 @@ func (r *RoomserverQueryAPI) QueryStateAfterEvents( return nil } - roomState := state.Prepare(r.DB) + roomState := state.NewStateResolution(r.DB) response.QueryStateAfterEventsRequest = *request roomNID, err := r.DB.RoomNID(ctx, request.RoomID) @@ -354,7 +354,7 @@ func (r *RoomserverQueryAPI) QueryMembershipsForRoom( func (r *RoomserverQueryAPI) getMembershipsBeforeEventNID( ctx context.Context, eventNID types.EventNID, joinedOnly bool, ) ([]types.Event, error) { - roomState := state.Prepare(r.DB) + roomState := state.NewStateResolution(r.DB) events := []types.Event{} // Lookup the event NID eIDs, err := r.DB.EventIDs(ctx, []types.EventNID{eventNID}) @@ -456,7 +456,7 @@ func (r *RoomserverQueryAPI) QueryServerAllowedToSeeEvent( func (r *RoomserverQueryAPI) checkServerAllowedToSeeEvent( ctx context.Context, eventID string, serverName gomatrixserverlib.ServerName, ) (bool, error) { - roomState := state.Prepare(r.DB) + roomState := state.NewStateResolution(r.DB) stateEntries, err := roomState.LoadStateAtEvent(ctx, eventID) if err != nil { return false, err @@ -676,7 +676,7 @@ func (r *RoomserverQueryAPI) QueryStateAndAuthChain( } func (r *RoomserverQueryAPI) loadStateAtEventIDs(ctx context.Context, eventIDs []string) ([]gomatrixserverlib.Event, error) { - roomState := state.Prepare(r.DB) + roomState := state.NewStateResolution(r.DB) prevStates, err := r.DB.StateAtEventIDs(ctx, eventIDs) if err != nil { switch err.(type) { diff --git a/roomserver/state/shared/shared.go b/roomserver/state/shared/shared.go new file mode 100644 index 000000000..a29b5e403 --- /dev/null +++ b/roomserver/state/shared/shared.go @@ -0,0 +1 @@ +package shared diff --git a/roomserver/state/state.go b/roomserver/state/state.go index 59327c5c3..0e81ddddb 100644 --- a/roomserver/state/state.go +++ b/roomserver/state/state.go @@ -35,7 +35,7 @@ type StateResolution struct { db database.RoomStateDatabase } -func Prepare(db database.RoomStateDatabase) StateResolution { +func NewStateResolution(db database.RoomStateDatabase) StateResolution { return StateResolution{ db: db, }