stakey/vspd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

database: Remove log param from CreateNew.

Browse Source 
This logger did not write any useful information and all errors
generated by the func are already returned to the caller for logging.
This commit is contained in:
jholdstock 2024-05-20 15:37:17 +01:00 committed by Jamie Holdstock
parent 17f993ae83
commit 64ad28e19b
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/vspd/config.go
View File

@ -410,12 +410,14 @@ func loadConfig() (*vspdConfig, error) {
} }
// Create new database. // 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 { if err != nil {
return nil, fmt.Errorf("error creating db file %s: %w", cfg.dbPath, err) return nil, fmt.Errorf("error creating db file %s: %w", cfg.dbPath, err)
} }
// Exit with success // Exit with success
fmt.Printf("Database initialized\n")
os.Exit(0) os.Exit(0)
} }

9
database/database.go
View File

@ -92,8 +92,7 @@ func (vdb *VspDatabase) WriteHotBackupFile() error {
// - the provided extended pubkey (to be used for deriving fee addresses). // - the provided extended pubkey (to be used for deriving fee addresses).
// - an ed25519 keypair to sign API responses. // - an ed25519 keypair to sign API responses.
// - a secret key to use for initializing a HTTP cookie store. // - a secret key to use for initializing a HTTP cookie store.
func CreateNew(dbFile, feeXPub string, log slog.Logger) error { func CreateNew(dbFile, feeXPub string) error {
log.Infof("Initializing new database at %s", dbFile)
db, err := bolt.Open(dbFile, 0600, &bolt.Options{Timeout: 1 * time.Second}) db, err := bolt.Open(dbFile, 0600, &bolt.Options{Timeout: 1 * time.Second})
if err != nil { if err != nil {
@ -115,8 +114,6 @@ func CreateNew(dbFile, feeXPub string, log slog.Logger) error {
return err return err
} }
log.Info("Generating ed25519 signing key")
// Generate ed25519 key // Generate ed25519 key
_, signKey, err := ed25519.GenerateKey(rand.Reader) _, signKey, err := ed25519.GenerateKey(rand.Reader)
if err != nil { 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. // Generate a secret key for initializing the cookie store.
log.Info("Generating cookie secret")
secret := make([]byte, 32) secret := make([]byte, 32)
_, err = rand.Read(secret) _, err = rand.Read(secret)
if err != nil { if err != nil {
@ -139,7 +135,6 @@ func CreateNew(dbFile, feeXPub string, log slog.Logger) error {
return err return err
} }
log.Info("Storing extended public key")
// Store fee xpub // Store fee xpub
err = vspBkt.Put(feeXPubK, []byte(feeXPub)) err = vspBkt.Put(feeXPubK, []byte(feeXPub))
if err != nil { if err != nil {
@ -165,8 +160,6 @@ func CreateNew(dbFile, feeXPub string, log slog.Logger) error {
return err return err
} }
log.Info("Database initialized")
return nil return nil
} }

2
database/database_test.go
View File

@ -91,7 +91,7 @@ func TestDatabase(t *testing.T) {
for testName, test := range tests { for testName, test := range tests {
// Create a new blank database for each sub-test. // Create a new blank database for each sub-test.
err := CreateNew(testDb, feeXPub, log) err := CreateNew(testDb, feeXPub)
if err != nil { if err != nil {
t.Fatalf("error creating test database: %v", err) t.Fatalf("error creating test database: %v", err)
} }

2
internal/webapi/setaltsignaddr_test.go
View File

@ -73,7 +73,7 @@ func TestMain(m *testing.M) {
os.Remove(testDb) os.Remove(testDb)
// Create a new blank database for all tests. // Create a new blank database for all tests.
err := database.CreateNew(testDb, feeXPub, log) err := database.CreateNew(testDb, feeXPub)
if err != nil { if err != nil {
panic(fmt.Errorf("error creating test database: %w", err)) panic(fmt.Errorf("error creating test database: %w", err))
} }