Database updates (#144)

* start moving some database stuff around

* continue moving db stuff around

* more fiddling

* more updates

* and some more

* and yet more

* i broke SOMETHING but what, it's a mystery

* tidy up

* vendor ttlcache

* use ttlcache

* fix up some tests

* rename some stuff

* little reminder

* some more updates

4 files changed, 6 insertions, 6 deletions

diff --git a/internal/oauth/clientstore.go b/internal/oauth/clientstore.go
index 998f6784e..2e7e0ae88 100644
--- a/internal/oauth/clientstore.go
+++ b/internal/oauth/clientstore.go
@@ -27,11 +27,11 @@ import (
 )
 
 type clientStore struct {
-	db db.DB
+	db db.Basic
 }
 
 // NewClientStore returns an implementation of the oauth2 ClientStore interface, using the given db as a storage backend.
-func NewClientStore(db db.DB) oauth2.ClientStore {
+func NewClientStore(db db.Basic) oauth2.ClientStore {
 	pts := &clientStore{
 		db: db,
 	}
diff --git a/internal/oauth/clientstore_test.go b/internal/oauth/clientstore_test.go
index c515ff513..fd3452405 100644
--- a/internal/oauth/clientstore_test.go
+++ b/internal/oauth/clientstore_test.go
@@ -99,7 +99,7 @@ func (suite *PgClientStoreTestSuite) TestClientSetAndDelete() {
 	// try to get the deleted client; we should get an error
 	deletedClient, err := cs.GetByID(context.Background(), suite.testClientID)
 	suite.Assert().Nil(deletedClient)
-	suite.Assert().EqualValues(db.ErrNoEntries{}, err)
+	suite.Assert().EqualValues(db.ErrNoEntries, err)
 }
 
 func TestPgClientStoreTestSuite(t *testing.T) {
diff --git a/internal/oauth/server.go b/internal/oauth/server.go
index 1289b18af..6d8f50064 100644
--- a/internal/oauth/server.go
+++ b/internal/oauth/server.go
@@ -66,7 +66,7 @@ type s struct {
 }
 
 // New returns a new oauth server that implements the Server interface
-func New(database db.DB, log *logrus.Logger) Server {
+func New(database db.Basic, log *logrus.Logger) Server {
 	ts := newTokenStore(context.Background(), database, log)
 	cs := NewClientStore(database)
 
diff --git a/internal/oauth/tokenstore.go b/internal/oauth/tokenstore.go
index 5f8e07882..4fd3183fc 100644
--- a/internal/oauth/tokenstore.go
+++ b/internal/oauth/tokenstore.go
@@ -34,7 +34,7 @@ import (
 // tokenStore is an implementation of oauth2.TokenStore, which uses our db interface as a storage backend.
 type tokenStore struct {
 	oauth2.TokenStore
-	db  db.DB
+	db  db.Basic
 	log *logrus.Logger
 }
 
@@ -42,7 +42,7 @@ type tokenStore struct {
 //
 // In order to allow tokens to 'expire', it will also set off a goroutine that iterates through
 // the tokens in the DB once per minute and deletes any that have expired.
-func newTokenStore(ctx context.Context, db db.DB, log *logrus.Logger) oauth2.TokenStore {
+func newTokenStore(ctx context.Context, db db.Basic, log *logrus.Logger) oauth2.TokenStore {
 	pts := &tokenStore{
 		db:  db,
 		log: log,