From 596c987a818a58dec62473992c6a387fd6b3b778 Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Mon, 9 May 2022 14:09:36 +0200 Subject: [PATCH] Revert "Fix issue where the EventReferenceSHA256 is not set" This reverts commit 8ae34c4e5f78584f0edb479f5a893556d2b95d19. --- roomserver/storage/postgres/events_table.go | 4 +--- roomserver/storage/sqlite3/events_table.go | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/roomserver/storage/postgres/events_table.go b/roomserver/storage/postgres/events_table.go index cdea208b8..86d226ce7 100644 --- a/roomserver/storage/postgres/events_table.go +++ b/roomserver/storage/postgres/events_table.go @@ -421,13 +421,11 @@ func (s *eventStatements) BulkSelectEventReference( defer internal.CloseAndLogIfError(ctx, rows, "bulkSelectEventReference: rows.close() failed") results := make([]gomatrixserverlib.EventReference, len(eventNIDs)) i := 0 - var eventSHA []byte for ; rows.Next(); i++ { result := &results[i] - if err = rows.Scan(&result.EventID, &eventSHA); err != nil { + if err = rows.Scan(&result.EventID, &result.EventSHA256); err != nil { return nil, err } - result.EventSHA256 = eventSHA } if err = rows.Err(); err != nil { return nil, err diff --git a/roomserver/storage/sqlite3/events_table.go b/roomserver/storage/sqlite3/events_table.go index f60119889..feb06150a 100644 --- a/roomserver/storage/sqlite3/events_table.go +++ b/roomserver/storage/sqlite3/events_table.go @@ -457,13 +457,11 @@ func (s *eventStatements) BulkSelectEventReference( defer internal.CloseAndLogIfError(ctx, rows, "bulkSelectEventReference: rows.close() failed") results := make([]gomatrixserverlib.EventReference, len(eventNIDs)) i := 0 - var eventSHA []byte for ; rows.Next(); i++ { result := &results[i] - if err = rows.Scan(&result.EventID, &eventSHA); err != nil { + if err = rows.Scan(&result.EventID, &result.EventSHA256); err != nil { return nil, err } - result.EventSHA256 = eventSHA } if i != len(eventNIDs) { return nil, fmt.Errorf("storage: event NIDs missing from the database (%d != %d)", i, len(eventNIDs))