diff --git a/cmd/vspd/config.go b/cmd/vspd/config.go index cec43e35..3da2f626 100644 --- a/cmd/vspd/config.go +++ b/cmd/vspd/config.go @@ -425,12 +425,14 @@ func loadConfig() (*vspdConfig, error) { } // Create new database. - err = database.CreateNew(cfg.dbPath, cfg.FeeXPub, cfg.logger(" DB")) + fmt.Printf("Initializing new database at %s\n", cfg.dbPath) + err = database.CreateNew(cfg.dbPath, cfg.FeeXPub) if err != nil { return nil, fmt.Errorf("error creating db file %s: %w", cfg.dbPath, err) } // Exit with success + fmt.Printf("Database initialized\n") os.Exit(0) } diff --git a/database/database.go b/database/database.go index 07407b89..235ae248 100644 --- a/database/database.go +++ b/database/database.go @@ -92,8 +92,7 @@ func (vdb *VspDatabase) WriteHotBackupFile() error { // - the provided extended pubkey (to be used for deriving fee addresses). // - an ed25519 keypair to sign API responses. // - a secret key to use for initializing a HTTP cookie store. -func CreateNew(dbFile, feeXPub string, log slog.Logger) error { - log.Infof("Initializing new database at %s", dbFile) +func CreateNew(dbFile, feeXPub string) error { db, err := bolt.Open(dbFile, 0600, &bolt.Options{Timeout: 1 * time.Second}) if err != nil { @@ -115,8 +114,6 @@ func CreateNew(dbFile, feeXPub string, log slog.Logger) error { return err } - log.Info("Generating ed25519 signing key") - // Generate ed25519 key _, signKey, err := ed25519.GenerateKey(rand.Reader) if err != nil { @@ -128,7 +125,6 @@ func CreateNew(dbFile, feeXPub string, log slog.Logger) error { } // Generate a secret key for initializing the cookie store. - log.Info("Generating cookie secret") secret := make([]byte, 32) _, err = rand.Read(secret) if err != nil { @@ -139,7 +135,6 @@ func CreateNew(dbFile, feeXPub string, log slog.Logger) error { return err } - log.Info("Storing extended public key") // Store fee xpub err = vspBkt.Put(feeXPubK, []byte(feeXPub)) if err != nil { @@ -165,8 +160,6 @@ func CreateNew(dbFile, feeXPub string, log slog.Logger) error { return err } - log.Info("Database initialized") - return nil } diff --git a/database/database_test.go b/database/database_test.go index 721eb6e5..a340f7a4 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -91,7 +91,7 @@ func TestDatabase(t *testing.T) { for testName, test := range tests { // Create a new blank database for each sub-test. - err := CreateNew(testDb, feeXPub, log) + err := CreateNew(testDb, feeXPub) if err != nil { t.Fatalf("error creating test database: %v", err) } diff --git a/internal/webapi/setaltsignaddr_test.go b/internal/webapi/setaltsignaddr_test.go index d95354d6..f3b0395b 100644 --- a/internal/webapi/setaltsignaddr_test.go +++ b/internal/webapi/setaltsignaddr_test.go @@ -73,7 +73,7 @@ func TestMain(m *testing.M) { os.Remove(testDb) // Create a new blank database for all tests. - err := database.CreateNew(testDb, feeXPub, log) + err := database.CreateNew(testDb, feeXPub) if err != nil { panic(fmt.Errorf("error creating test database: %w", err)) }