From 9640e2f696d99ca4d0ff2a7667dffbb009509055 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 5 Feb 2020 16:38:46 +0000 Subject: [PATCH] Fix cases where state package was shadowed --- roomserver/input/events.go | 4 ++-- roomserver/input/latest_events.go | 8 ++++---- roomserver/query/query.go | 20 ++++++++++---------- roomserver/state/v1/state.go | 2 -- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/roomserver/input/events.go b/roomserver/input/events.go index 21068695e..03023a4af 100644 --- a/roomserver/input/events.go +++ b/roomserver/input/events.go @@ -153,7 +153,7 @@ func calculateAndSetState( event gomatrixserverlib.Event, ) error { // TODO: get the correct room version - state, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, db) + roomState, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, db) if err != nil { return err } @@ -171,7 +171,7 @@ func calculateAndSetState( } } else { // We haven't been told what the state at the event is so we need to calculate it from the prev_events - if stateAtEvent.BeforeStateSnapshotNID, err = state.CalculateAndStoreStateBeforeEvent(ctx, event, roomNID); err != nil { + if stateAtEvent.BeforeStateSnapshotNID, err = roomState.CalculateAndStoreStateBeforeEvent(ctx, event, roomNID); err != nil { return err } } diff --git a/roomserver/input/latest_events.go b/roomserver/input/latest_events.go index 6f5330646..7e03d544a 100644 --- a/roomserver/input/latest_events.go +++ b/roomserver/input/latest_events.go @@ -174,7 +174,7 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() error { func (u *latestEventsUpdater) latestState() error { var err error // TODO: get the correct room version - state, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, u.db) + roomState, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, u.db) if err != nil { return err } @@ -183,21 +183,21 @@ func (u *latestEventsUpdater) latestState() error { for i := range u.latest { latestStateAtEvents[i] = u.latest[i].StateAtEvent } - u.newStateNID, err = state.CalculateAndStoreStateAfterEvents( + u.newStateNID, err = roomState.CalculateAndStoreStateAfterEvents( u.ctx, u.roomNID, latestStateAtEvents, ) if err != nil { return err } - u.removed, u.added, err = state.DifferenceBetweeenStateSnapshots( + u.removed, u.added, err = roomState.DifferenceBetweeenStateSnapshots( u.ctx, u.oldStateNID, u.newStateNID, ) if err != nil { return err } - u.stateBeforeEventRemoves, u.stateBeforeEventAdds, err = state.DifferenceBetweeenStateSnapshots( + u.stateBeforeEventRemoves, u.stateBeforeEventAdds, err = roomState.DifferenceBetweeenStateSnapshots( u.ctx, u.newStateNID, u.stateAtEvent.BeforeStateSnapshotNID, ) return err diff --git a/roomserver/query/query.go b/roomserver/query/query.go index 4e3ff4449..d0304e43e 100644 --- a/roomserver/query/query.go +++ b/roomserver/query/query.go @@ -103,7 +103,7 @@ func (r *RoomserverQueryAPI) QueryLatestEventsAndState( response *api.QueryLatestEventsAndStateResponse, ) error { // TODO: get the correct room version - state, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) + roomState, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) if err != nil { return err } @@ -124,7 +124,7 @@ func (r *RoomserverQueryAPI) QueryLatestEventsAndState( } // Look up the currrent state for the requested tuples. - stateEntries, err := state.LoadStateAtSnapshotForStringTuples( + stateEntries, err := roomState.LoadStateAtSnapshotForStringTuples( ctx, currentStateSnapshotNID, request.StateToFetch, ) if err != nil { @@ -147,7 +147,7 @@ func (r *RoomserverQueryAPI) QueryStateAfterEvents( response *api.QueryStateAfterEventsResponse, ) error { // TODO: get the correct room version - state, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) + roomState, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) if err != nil { return err } @@ -173,7 +173,7 @@ func (r *RoomserverQueryAPI) QueryStateAfterEvents( response.PrevEventsExist = true // Look up the currrent state for the requested tuples. - stateEntries, err := state.LoadStateAfterEventsForStringTuples( + stateEntries, err := roomState.LoadStateAfterEventsForStringTuples( ctx, prevStates, request.StateToFetch, ) if err != nil { @@ -330,7 +330,7 @@ func (r *RoomserverQueryAPI) getMembershipsBeforeEventNID( ctx context.Context, eventNID types.EventNID, joinedOnly bool, ) ([]types.Event, error) { // TODO: get the correct room version - state, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) + roomState, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) if err != nil { return []types.Event{}, err } @@ -348,7 +348,7 @@ func (r *RoomserverQueryAPI) getMembershipsBeforeEventNID( } // Fetch the state as it was when this event was fired - stateEntries, err := state.LoadCombinedStateAfterEvents(ctx, prevState) + stateEntries, err := roomState.LoadCombinedStateAfterEvents(ctx, prevState) if err != nil { return nil, err } @@ -436,12 +436,12 @@ func (r *RoomserverQueryAPI) checkServerAllowedToSeeEvent( ctx context.Context, eventID string, serverName gomatrixserverlib.ServerName, ) (bool, error) { // TODO: get the correct room version - state, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) + roomState, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) if err != nil { return false, err } - stateEntries, err := state.LoadStateAtEvent(ctx, eventID) + stateEntries, err := roomState.LoadStateAtEvent(ctx, eventID) if err != nil { return false, err } @@ -596,7 +596,7 @@ func (r *RoomserverQueryAPI) QueryStateAndAuthChain( response *api.QueryStateAndAuthChainResponse, ) error { // TODO: get the correct room version - state, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) + roomState, err := state.GetStateResolutionAlgorithm(state.StateResolutionAlgorithmV1, r.DB) if err != nil { return err } @@ -623,7 +623,7 @@ func (r *RoomserverQueryAPI) QueryStateAndAuthChain( response.PrevEventsExist = true // Look up the currrent state for the requested tuples. - stateEntries, err := state.LoadCombinedStateAfterEvents( + stateEntries, err := roomState.LoadCombinedStateAfterEvents( ctx, prevStates, ) if err != nil { diff --git a/roomserver/state/v1/state.go b/roomserver/state/v1/state.go index 4e83419b3..5683745bf 100644 --- a/roomserver/state/v1/state.go +++ b/roomserver/state/v1/state.go @@ -1,6 +1,4 @@ // Copyright 2017 Vector Creations Ltd -// Copyright 2018 New Vector Ltd -// Copyright 2019-2020 The Matrix.org Foundation C.I.C. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.