From 4176595d9c44ff3183ada20dea76e2305d5ecdda Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 28 Jul 2021 16:23:24 +0100 Subject: [PATCH] Try with new scanner interface --- go.mod | 2 +- go.sum | 4 ++-- keyserver/storage/postgres/cross_signing_keys_table.go | 2 +- keyserver/storage/sqlite3/cross_signing_keys_table.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 777e3c84..05391218 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/matrix-org/go-http-js-libp2p v0.0.0-20200518170932-783164aeeda4 github.com/matrix-org/go-sqlite3-js v0.0.0-20210709140738-b0d1ba599a6d github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 - github.com/matrix-org/gomatrixserverlib v0.0.0-20210728135905-8efb6cec19a0 + github.com/matrix-org/gomatrixserverlib v0.0.0-20210728152245-43fa78d3763b github.com/matrix-org/naffka v0.0.0-20210623111924-14ff508b58e0 github.com/matrix-org/pinecone v0.0.0-20210623102758-74f885644c1b github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4 diff --git a/go.sum b/go.sum index 7ce30dff..82bed3e6 100644 --- a/go.sum +++ b/go.sum @@ -1027,8 +1027,8 @@ github.com/matrix-org/go-sqlite3-js v0.0.0-20210709140738-b0d1ba599a6d/go.mod h1 github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26/go.mod h1:3fxX6gUjWyI/2Bt7J1OLhpCzOfO/bB3AiX0cJtEKud0= github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 h1:ZtO5uywdd5dLDCud4r0r55eP4j9FuUNpl60Gmntcop4= github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s= -github.com/matrix-org/gomatrixserverlib v0.0.0-20210728135905-8efb6cec19a0 h1:3BTULGd2ejS06gFhqsVJSSXCut+31GNFaoji5HO7guE= -github.com/matrix-org/gomatrixserverlib v0.0.0-20210728135905-8efb6cec19a0/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20210728152245-43fa78d3763b h1:s0u1FhkGyZc+92BvY98UvFBAhj/cOPX1ROBdJW9ih4E= +github.com/matrix-org/gomatrixserverlib v0.0.0-20210728152245-43fa78d3763b/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= github.com/matrix-org/naffka v0.0.0-20210623111924-14ff508b58e0 h1:HZCzy4oVzz55e+cOMiX/JtSF2UOY1evBl2raaE7ACcU= github.com/matrix-org/naffka v0.0.0-20210623111924-14ff508b58e0/go.mod h1:sjyPyRxKM5uw1nD2cJ6O2OxI6GOqyVBfNXqKjBZTBZE= github.com/matrix-org/pinecone v0.0.0-20210623102758-74f885644c1b h1:5X5vdWQ13xrNkJVqaJHPsrt7rKkMJH5iac0EtfOuxSg= diff --git a/keyserver/storage/postgres/cross_signing_keys_table.go b/keyserver/storage/postgres/cross_signing_keys_table.go index 2d0991c7..93c31475 100644 --- a/keyserver/storage/postgres/cross_signing_keys_table.go +++ b/keyserver/storage/postgres/cross_signing_keys_table.go @@ -72,7 +72,7 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser( var keyType gomatrixserverlib.CrossSigningKeyPurpose var keyID gomatrixserverlib.KeyID var keyData gomatrixserverlib.Base64Bytes - if err := rows.Scan(&keyType, &keyID, keyData); err != nil { + if err := rows.Scan(&keyType, &keyID, &keyData); err != nil { return nil, err } r[keyType][keyID] = keyData diff --git a/keyserver/storage/sqlite3/cross_signing_keys_table.go b/keyserver/storage/sqlite3/cross_signing_keys_table.go index acc7d9c7..03e7cf2b 100644 --- a/keyserver/storage/sqlite3/cross_signing_keys_table.go +++ b/keyserver/storage/sqlite3/cross_signing_keys_table.go @@ -72,10 +72,10 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser( var keyType gomatrixserverlib.CrossSigningKeyPurpose var keyID gomatrixserverlib.KeyID var keyData gomatrixserverlib.Base64Bytes - if err := rows.Scan(&keyType, &keyID, keyData); err != nil { + if err := rows.Scan(&keyType, &keyID, &keyData); err != nil { return nil, err } - r[keyType][keyID] = keyData + r[keyType][keyID] = gomatrixserverlib.Base64Bytes{} } return }