Merge branch 'controller-config' into 15-need-common-configuration-storage

nucleus/controller.go

@@ -54,7 +54,7 @@ func (c Core) Init(socket, filename string) {
 		c.config.CliSocket = socket
 	}
 
-	c.database = interfaces.NewDatabaseClient(c.config.DatabaseSocket, c.config.DatabaseUser, c.config.DatabasePassword, c.config.DatabaseCrypto)
+	c.database = interfaces.NewMockDatabaseClient(c.config.DatabaseSocket, c.config.DatabaseUser, c.config.DatabasePassword, c.config.DatabaseCrypto)
 }
 
 func (c Core) Shutdown() {

nucleus/interfaces/database.go

@@ -10,6 +10,6 @@ type MockDatabase struct {
 func (db MockDatabase) DropTables() {
 }
 
-func NewDatabaseClient(uri, username, password string, encrypted bool) Database {
+func NewMockDatabaseClient(uri, username, password string, encrypted bool) Database {
 	return MockDatabase{}
 }