working commit

app/server/server.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"mbase/app/config"
-	"mbase/app/database"
-	"mbase/app/descriptor"
+	"mbase/app/maindb"
+	"mbase/app/descr"
 	"mbase/app/logic"
 	"mbase/pkg/aux509"
 	"mbase/pkg/logger"
@@ -32,10 +32,10 @@ type Server struct {
 	log  *logger.Logger
 	nacl *netacl.NetACL
 
-	db       *database.Database
+	db       *maindb.Database
 	x509cert []byte
 	x509key  []byte
-	state    descriptor.Server
+	state    descr.Server
 	sfile    string
 }
 
@@ -164,7 +164,7 @@ func (srv *Server) Build() error {
 	srv.log.Infof("Network ACL is:\n%s\n", string(naclYAML))
 
 	// Create database
-	srv.db, err = database.NewDatabase(srv.conf.DataDir)
+	srv.db, err = maindb.NewDatabase(srv.conf.DataDir)
 
 	err = srv.db.OpenDatabase()
 	if err != nil {