From 8214df90a85cf78aeb3f18efcea1c0155c6739d6 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 4 Jun 2020 11:05:00 +0100 Subject: [PATCH] s/Base64String/Base64Bytes/g Requires https://github.com/matrix-org/gomatrixserverlib/pull/203 to land first --- clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go | 2 +- clientapi/threepid/invites.go | 2 +- cmd/dendrite-demo-libp2p/mdnslistener.go | 2 +- cmd/dendritejs/keyfetcher.go | 2 +- federationapi/routing/keys.go | 2 +- serverkeyapi/storage/postgres/keydb.go | 2 +- serverkeyapi/storage/sqlite3/keydb.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go b/clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go index b5077c070..0dd5b1fea 100644 --- a/clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go +++ b/clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go @@ -18,4 +18,4 @@ package sqlite3 func isConstraintError(err error) bool { return false -} \ No newline at end of file +} diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go index 8fed99565..8f173bf8a 100644 --- a/clientapi/threepid/invites.go +++ b/clientapi/threepid/invites.go @@ -279,7 +279,7 @@ func queryIDServerPubKey(ctx context.Context, idServerName string, keyID string) } var pubKeyRes struct { - PublicKey gomatrixserverlib.Base64String `json:"public_key"` + PublicKey gomatrixserverlib.Base64Bytes `json:"public_key"` } if resp.StatusCode != http.StatusOK { diff --git a/cmd/dendrite-demo-libp2p/mdnslistener.go b/cmd/dendrite-demo-libp2p/mdnslistener.go index 01705cf39..c30aaa331 100644 --- a/cmd/dendrite-demo-libp2p/mdnslistener.go +++ b/cmd/dendrite-demo-libp2p/mdnslistener.go @@ -43,7 +43,7 @@ func (n *mDNSListener) HandlePeerFound(p peer.AddrInfo) { KeyID: "ed25519:p2pdemo", }: { VerifyKey: gomatrixserverlib.VerifyKey{ - Key: gomatrixserverlib.Base64String(raw), + Key: gomatrixserverlib.Base64Bytes(raw), }, ValidUntilTS: math.MaxUint64 >> 1, ExpiredTS: gomatrixserverlib.PublicKeyNotExpired, diff --git a/cmd/dendritejs/keyfetcher.go b/cmd/dendritejs/keyfetcher.go index 0073b7e6b..cef045372 100644 --- a/cmd/dendritejs/keyfetcher.go +++ b/cmd/dendritejs/keyfetcher.go @@ -62,7 +62,7 @@ func (f *libp2pKeyFetcher) FetchKeys( if err != nil { return nil, fmt.Errorf("Failed to extract raw bytes from public key: %w", err) } - b64Key := gomatrixserverlib.Base64String(pubKeyBytes) + b64Key := gomatrixserverlib.Base64Bytes(pubKeyBytes) res[req] = gomatrixserverlib.PublicKeyLookupResult{ VerifyKey: gomatrixserverlib.VerifyKey{ Key: b64Key, diff --git a/federationapi/routing/keys.go b/federationapi/routing/keys.go index 79cc1f82c..a1dd0fd09 100644 --- a/federationapi/routing/keys.go +++ b/federationapi/routing/keys.go @@ -44,7 +44,7 @@ func localKeys(cfg *config.Dendrite, validUntil time.Time) (*gomatrixserverlib.S keys.VerifyKeys = map[gomatrixserverlib.KeyID]gomatrixserverlib.VerifyKey{ cfg.Matrix.KeyID: { - Key: gomatrixserverlib.Base64String(publicKey), + Key: gomatrixserverlib.Base64Bytes(publicKey), }, } diff --git a/serverkeyapi/storage/postgres/keydb.go b/serverkeyapi/storage/postgres/keydb.go index da3a4d370..6282e13bb 100644 --- a/serverkeyapi/storage/postgres/keydb.go +++ b/serverkeyapi/storage/postgres/keydb.go @@ -60,7 +60,7 @@ func NewDatabase( } value := gomatrixserverlib.PublicKeyLookupResult{ VerifyKey: gomatrixserverlib.VerifyKey{ - Key: gomatrixserverlib.Base64String(serverKey), + Key: gomatrixserverlib.Base64Bytes(serverKey), }, ValidUntilTS: gomatrixserverlib.AsTimestamp(time.Now().Add(100 * 365 * 24 * time.Hour)), ExpiredTS: gomatrixserverlib.PublicKeyNotExpired, diff --git a/serverkeyapi/storage/sqlite3/keydb.go b/serverkeyapi/storage/sqlite3/keydb.go index 1ad6e7e88..a73b6f80a 100644 --- a/serverkeyapi/storage/sqlite3/keydb.go +++ b/serverkeyapi/storage/sqlite3/keydb.go @@ -75,7 +75,7 @@ func NewDatabase( } value := gomatrixserverlib.PublicKeyLookupResult{ VerifyKey: gomatrixserverlib.VerifyKey{ - Key: gomatrixserverlib.Base64String(serverKey), + Key: gomatrixserverlib.Base64Bytes(serverKey), }, ValidUntilTS: gomatrixserverlib.AsTimestamp(time.Now().Add(100 * 365 * 24 * time.Hour)), ExpiredTS: gomatrixserverlib.PublicKeyNotExpired,