Try with new scanner interface

This commit is contained in:
Neil Alexander 2021-07-28 16:23:24 +01:00
parent 2fd9102b08
commit 4176595d9c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 6 additions and 6 deletions

2
go.mod
View file

@ -31,7 +31,7 @@ require (
github.com/matrix-org/go-http-js-libp2p v0.0.0-20200518170932-783164aeeda4 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/go-sqlite3-js v0.0.0-20210709140738-b0d1ba599a6d
github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 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/naffka v0.0.0-20210623111924-14ff508b58e0
github.com/matrix-org/pinecone v0.0.0-20210623102758-74f885644c1b github.com/matrix-org/pinecone v0.0.0-20210623102758-74f885644c1b
github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4 github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4

4
go.sum
View file

@ -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-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 h1:ZtO5uywdd5dLDCud4r0r55eP4j9FuUNpl60Gmntcop4=
github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s= 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-20210728152245-43fa78d3763b h1:s0u1FhkGyZc+92BvY98UvFBAhj/cOPX1ROBdJW9ih4E=
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/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 h1:HZCzy4oVzz55e+cOMiX/JtSF2UOY1evBl2raaE7ACcU=
github.com/matrix-org/naffka v0.0.0-20210623111924-14ff508b58e0/go.mod h1:sjyPyRxKM5uw1nD2cJ6O2OxI6GOqyVBfNXqKjBZTBZE= 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= github.com/matrix-org/pinecone v0.0.0-20210623102758-74f885644c1b h1:5X5vdWQ13xrNkJVqaJHPsrt7rKkMJH5iac0EtfOuxSg=

View file

@ -72,7 +72,7 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
var keyType gomatrixserverlib.CrossSigningKeyPurpose var keyType gomatrixserverlib.CrossSigningKeyPurpose
var keyID gomatrixserverlib.KeyID var keyID gomatrixserverlib.KeyID
var keyData gomatrixserverlib.Base64Bytes 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 return nil, err
} }
r[keyType][keyID] = keyData r[keyType][keyID] = keyData

View file

@ -72,10 +72,10 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
var keyType gomatrixserverlib.CrossSigningKeyPurpose var keyType gomatrixserverlib.CrossSigningKeyPurpose
var keyID gomatrixserverlib.KeyID var keyID gomatrixserverlib.KeyID
var keyData gomatrixserverlib.Base64Bytes 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 return nil, err
} }
r[keyType][keyID] = keyData r[keyType][keyID] = gomatrixserverlib.Base64Bytes{}
} }
return return
} }