From fbfb59baf1cdd1117bc34d693e08b1a04d14c45d Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 15 May 2020 09:30:07 +0100
Subject: [PATCH] Review comments

---
 cmd/dendrite-demo-libp2p/main.go |  1 -
 common/basecomponent/base.go     |  2 +-
 common/keydb/cache/keydb.go      | 12 ++++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go
index ef2622538..0ff610a5b 100644
--- a/cmd/dendrite-demo-libp2p/main.go
+++ b/cmd/dendrite-demo-libp2p/main.go
@@ -147,7 +147,6 @@ func main() {
 	deviceDB := base.Base.CreateDeviceDB()
 	keyDB := createKeyDB(base)
 	federation := createFederationClient(base)
-	// TODO: cache here
 	keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives)
 
 	rsAPI := roomserver.SetupRoomServerComponent(
diff --git a/common/basecomponent/base.go b/common/basecomponent/base.go
index 0aeb86085..4342e25a3 100644
--- a/common/basecomponent/base.go
+++ b/common/basecomponent/base.go
@@ -187,7 +187,7 @@ func (b *BaseDendrite) CreateKeyDB() keydb.Database {
 		logrus.WithError(err).Panicf("failed to connect to keys db")
 	}
 
-	cachedDB, err := cache.NewDatabase(db, b.ImmutableCache)
+	cachedDB, err := cache.NewKeyDatabase(db, b.ImmutableCache)
 	if err != nil {
 		logrus.WithError(err).Panicf("failed to create key cache wrapper")
 	}
diff --git a/common/keydb/cache/keydb.go b/common/keydb/cache/keydb.go
index 4213dc079..ae929fa4c 100644
--- a/common/keydb/cache/keydb.go
+++ b/common/keydb/cache/keydb.go
@@ -11,31 +11,31 @@ import (
 
 // A Database implements gomatrixserverlib.KeyDatabase and is used to store
 // the public keys for other matrix servers.
-type Database struct {
+type KeyDatabase struct {
 	inner keydb.Database
 	cache caching.ImmutableCache
 }
 
-func NewDatabase(inner keydb.Database, cache caching.ImmutableCache) (*Database, error) {
+func NewKeyDatabase(inner keydb.Database, cache caching.ImmutableCache) (*KeyDatabase, error) {
 	if inner == nil {
 		return nil, errors.New("inner database can't be nil")
 	}
 	if cache == nil {
 		return nil, errors.New("cache can't be nil")
 	}
-	return &Database{
+	return &KeyDatabase{
 		inner: inner,
 		cache: cache,
 	}, nil
 }
 
 // FetcherName implements KeyFetcher
-func (d Database) FetcherName() string {
+func (d KeyDatabase) FetcherName() string {
 	return "InMemoryKeyCache"
 }
 
 // FetchKeys implements gomatrixserverlib.KeyDatabase
-func (d *Database) FetchKeys(
+func (d *KeyDatabase) FetchKeys(
 	ctx context.Context,
 	requests map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.Timestamp,
 ) (map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult, error) {
@@ -58,7 +58,7 @@ func (d *Database) FetchKeys(
 }
 
 // StoreKeys implements gomatrixserverlib.KeyDatabase
-func (d *Database) StoreKeys(
+func (d *KeyDatabase) StoreKeys(
 	ctx context.Context,
 	keyMap map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult,
 ) error {