mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic, fix lint error

Browse source
This commit is contained in:
Neil Alexander 2021-11-22 15:43:12 +00:00
parent 3c1d874ebd
commit a2e1a4a485
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/dendrite-demo-libp2p/main.go
View file

@ -49,7 +49,7 @@ import (
func createKeyDB( func createKeyDB(
base *P2PDendrite, base *P2PDendrite,
db gomatrixserverlib.KeyDatabase, db *gomatrixserverlib.KeyRing,
) { ) {
mdns := mDNSListener{ mdns := mDNSListener{
host: base.LibP2P, host: base.LibP2P,
@ -168,11 +168,9 @@ func main() {
panic("failed to create new public rooms provider: " + err.Error()) panic("failed to create new public rooms provider: " + err.Error())
} }
/* createKeyDB(
createKeyDB( base, keyRing,
base, keyRing, )
)
*/
monolith := setup.Monolith{ monolith := setup.Monolith{
Config: base.Base.Cfg, Config: base.Base.Cfg,

4
cmd/dendrite-demo-libp2p/mdnslistener.go
View file

@ -25,7 +25,7 @@ import (
) )
type mDNSListener struct { type mDNSListener struct {
keydb gomatrixserverlib.KeyDatabase keydb *gomatrixserverlib.KeyRing
host host.Host host host.Host
} }
@ -35,7 +35,7 @@ func (n *mDNSListener) HandlePeerFound(p peer.AddrInfo) {
} }
if pubkey, err := p.ID.ExtractPublicKey(); err == nil { if pubkey, err := p.ID.ExtractPublicKey(); err == nil {
raw, _ := pubkey.Raw() raw, _ := pubkey.Raw()
if err := n.keydb.StoreKeys( if err := n.keydb.KeyDatabase.StoreKeys(
context.Background(), context.Background(),
map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{ map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{
{ {

4
federationapi/storage/sqlite3/server_key_table.go
View file

@ -67,7 +67,9 @@ type serverSigningKeyStatements struct {
} }
func NewSQLiteServerSigningKeysTable(db *sql.DB) (s *serverSigningKeyStatements, err error) { func NewSQLiteServerSigningKeysTable(db *sql.DB) (s *serverSigningKeyStatements, err error) {
s = &serverSigningKeyStatements{} s = &serverSigningKeyStatements{
db: db,
}
_, err = db.Exec(serverSigningKeysSchema) _, err = db.Exec(serverSigningKeysSchema)
if err != nil { if err != nil {
return return