akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

channeldb: unify Create/Open into simply Open

Browse Source 
Open will now create, and initialize the db if it does not yet exist.
This commit is contained in:
Olaoluwa Osuntokun 2016-03-24 14:31:46 -07:00
parent 082a8a34e3
commit 3f5664b46d
3 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channeldb/channel_test.go
View File

@ -95,7 +95,7 @@ func TestOpenChannelEncodeDecode(t *testing.T) {
// Next, create channeldb for the first time, also setting a mock // Next, create channeldb for the first time, also setting a mock
// EncryptorDecryptor implementation for testing purposes. // EncryptorDecryptor implementation for testing purposes.
cdb, err := Create(tempDirName) cdb, err := Open(tempDirName)
if err != nil { if err != nil {
t.Fatalf("unable to create channeldb: %v", err) t.Fatalf("unable to create channeldb: %v", err)
} }
@ -154,7 +154,7 @@ func TestOpenChannelEncodeDecode(t *testing.T) {
TotalSatoshisReceived: 2, TotalSatoshisReceived: 2,
TotalNetFees: 9, TotalNetFees: 9,
CreationTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC), CreationTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
db: cdb, Db: cdb,
} }
if err := state.FullSync(); err != nil { if err := state.FullSync(); err != nil {

25
channeldb/db.go
View File

@ -44,22 +44,15 @@ type DB struct {
// sensitive data encrypted by the passed EncryptorDecryptor implementation. // sensitive data encrypted by the passed EncryptorDecryptor implementation.
// TODO(roasbeef): versioning? // TODO(roasbeef): versioning?
func Open(dbPath string) (*DB, error) { func Open(dbPath string) (*DB, error) {
if !fileExists(dbPath) {
return nil, ErrNoExists
}
path := filepath.Join(dbPath, dbName) path := filepath.Join(dbPath, dbName)
bdb, err := bolt.Open(path, 0600, nil)
if err != nil { if !fileExists(path) {
if err := createChannelDB(dbPath); err != nil {
return nil, err return nil, err
} }
return &DB{store: bdb}, nil
} }
// Create... bdb, err := bolt.Open(path, 0600, nil)
func Create(dbPath string) (*DB, error) {
bdb, err := createChannelDB(dbPath)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -86,17 +79,17 @@ func (d *DB) Close() error {
} }
// createChannelDB... // createChannelDB...
func createChannelDB(dbPath string) (*bolt.DB, error) { func createChannelDB(dbPath string) error {
if !fileExists(dbPath) { if !fileExists(dbPath) {
if err := os.MkdirAll(dbPath, 0700); err != nil { if err := os.MkdirAll(dbPath, 0700); err != nil {
return nil, err return err
} }
} }
path := filepath.Join(dbPath, dbName) path := filepath.Join(dbPath, dbName)
bdb, err := bolt.Open(path, 0600, nil) bdb, err := bolt.Open(path, 0600, nil)
if err != nil { if err != nil {
return nil, err return err
} }
err = bdb.Update(func(tx *bolt.Tx) error { err = bdb.Update(func(tx *bolt.Tx) error {
@ -115,10 +108,10 @@ func createChannelDB(dbPath string) (*bolt.DB, error) {
return nil return nil
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to create new channeldb") return fmt.Errorf("unable to create new channeldb")
} }
return bdb, nil return bdb.Close()
} }
// fileExists... // fileExists...

21
channeldb/db_test.go
View File

@ -3,16 +3,11 @@ package channeldb
import ( import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath"
"testing" "testing"
) )
func TestOpenNotCreated(t *testing.T) { func TestOpenWithCreate(t *testing.T) {
if _, err := Open("path doesn't exist"); err != ErrNoExists {
t.Fatalf("channeldb Open should fail due to non-existant dir")
}
}
func TestCreateThenOpen(t *testing.T) {
// First, create a temporary directory to be used for the duration of // First, create a temporary directory to be used for the duration of
// this test. // this test.
tempDirName, err := ioutil.TempDir("", "channeldb") tempDirName, err := ioutil.TempDir("", "channeldb")
@ -21,8 +16,9 @@ func TestCreateThenOpen(t *testing.T) {
} }
defer os.RemoveAll(tempDirName) defer os.RemoveAll(tempDirName)
// Next, create channeldb for the first time. // Next, open thereby creating channeldb for the first time.
cdb, err := Create(tempDirName) dbPath := filepath.Join(tempDirName, "cdb")
cdb, err := Open(dbPath)
if err != nil { if err != nil {
t.Fatalf("unable to create channeldb: %v", err) t.Fatalf("unable to create channeldb: %v", err)
} }
@ -30,9 +26,8 @@ func TestCreateThenOpen(t *testing.T) {
t.Fatalf("unable to close channeldb: %v", err) t.Fatalf("unable to close channeldb: %v", err)
} }
// Open should now succeed as the cdb was created above. // The path should have been succesfully created.
cdb, err = Open(tempDirName) if !fileExists(dbPath) {
if err != nil { t.Fatalf("channeldb failed to create data directory")
t.Fatalf("unable to open channeldb: %v", err)
} }
} }