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

Fix build issues

Browse source
This commit is contained in:
Neil Alexander 2020-12-02 15:48:45 +00:00
parent 3ba3530685
commit 7fc3852bdf
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
federationapi/routing/send_test.go
View file

@ -146,6 +146,14 @@ func (t *testRoomserverAPI) PerformLeave(
return nil return nil
} }
func (t *testRoomserverAPI) PerformInboundPeek(
ctx context.Context,
req *api.PerformInboundPeekRequest,
res *api.PerformInboundPeekResponse,
) error {
return nil
}
// Query the latest events and state for a room from the room server. // Query the latest events and state for a room from the room server.
func (t *testRoomserverAPI) QueryLatestEventsAndState( func (t *testRoomserverAPI) QueryLatestEventsAndState(
ctx context.Context, ctx context.Context,

7
roomserver/api/perform.go
View file

@ -177,10 +177,10 @@ type PerformInboundPeekResponse struct {
RoomVersion gomatrixserverlib.RoomVersion `json:"room_version"` RoomVersion gomatrixserverlib.RoomVersion `json:"room_version"`
// The current state and auth chain events. // The current state and auth chain events.
// The lists will be in an arbitrary order. // The lists will be in an arbitrary order.
StateEvents []gomatrixserverlib.HeaderedEvent `json:"state_events"` StateEvents []*gomatrixserverlib.HeaderedEvent `json:"state_events"`
AuthChainEvents []gomatrixserverlib.HeaderedEvent `json:"auth_chain_events"` AuthChainEvents []*gomatrixserverlib.HeaderedEvent `json:"auth_chain_events"`
// The event at which this state was captured // The event at which this state was captured
LatestEvent gomatrixserverlib.HeaderedEvent `json:"latest_event"` LatestEvent *gomatrixserverlib.HeaderedEvent `json:"latest_event"`
} }
// PerformForgetRequest is a request to PerformForget // PerformForgetRequest is a request to PerformForget
@ -190,4 +190,3 @@ type PerformForgetRequest struct {
} }
type PerformForgetResponse struct{} type PerformForgetResponse struct{}

4
roomserver/internal/perform/perform_inbound_peek.go
View file

@ -56,7 +56,7 @@ func (r *InboundPeeker) PerformInboundPeek(
response.RoomExists = true response.RoomExists = true
response.RoomVersion = info.RoomVersion response.RoomVersion = info.RoomVersion
var stateEvents []gomatrixserverlib.Event var stateEvents []*gomatrixserverlib.Event
var currentStateSnapshotNID types.StateSnapshotNID var currentStateSnapshotNID types.StateSnapshotNID
latestEventRefs, currentStateSnapshotNID, _, err := latestEventRefs, currentStateSnapshotNID, _, err :=
@ -68,7 +68,7 @@ func (r *InboundPeeker) PerformInboundPeek(
if err != nil { if err != nil {
return err return err
} }
var sortedLatestEvents []gomatrixserverlib.Event var sortedLatestEvents []*gomatrixserverlib.Event
for _, ev := range latestEvents { for _, ev := range latestEvents {
sortedLatestEvents = append(sortedLatestEvents, ev.Event) sortedLatestEvents = append(sortedLatestEvents, ev.Event)
} }

2
roomserver/internal/query/query.go
View file

@ -447,7 +447,7 @@ func (r *Queryer) QueryStateAndAuthChain(
response.RoomExists = true response.RoomExists = true
response.RoomVersion = info.RoomVersion response.RoomVersion = info.RoomVersion
var stateEvents []gomatrixserverlib.Event var stateEvents []*gomatrixserverlib.Event
stateEvents, err = r.loadStateAtEventIDs(ctx, *info, request.PrevEventIDs) stateEvents, err = r.loadStateAtEventIDs(ctx, *info, request.PrevEventIDs)
if err != nil { if err != nil {
return err return err

4
roomserver/internal/query/query_test.go
View file

@ -106,7 +106,7 @@ func TestGetAuthChainSingle(t *testing.T) {
t.Fatalf("Failed to add events to db: %v", err) t.Fatalf("Failed to add events to db: %v", err)
} }
result, err := getAuthChain(context.TODO(), db.EventsFromIDs, []string{"e"}) result, err := GetAuthChain(context.TODO(), db.EventsFromIDs, []string{"e"})
if err != nil { if err != nil {
t.Fatalf("getAuthChain failed: %v", err) t.Fatalf("getAuthChain failed: %v", err)
} }
@ -139,7 +139,7 @@ func TestGetAuthChainMultiple(t *testing.T) {
t.Fatalf("Failed to add events to db: %v", err) t.Fatalf("Failed to add events to db: %v", err)
} }
result, err := getAuthChain(context.TODO(), db.EventsFromIDs, []string{"e", "f"}) result, err := GetAuthChain(context.TODO(), db.EventsFromIDs, []string{"e", "f"})
if err != nil { if err != nil {
t.Fatalf("getAuthChain failed: %v", err) t.Fatalf("getAuthChain failed: %v", err)
} }