certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Export DbBackendType in order to fix IAVL tests

This commit is contained in:
Adrian Brink 2018-02-02 18:50:24 +01:00
parent 2e76546223
commit cbc63518e5
No known key found for this signature in database
GPG Key ID: F61053D3FBD06353
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/backend_test.go
View File

@ -15,7 +15,7 @@ func cleanupDBDir(dir, name string) {
os.RemoveAll(filepath.Join(dir, name) + ".db") os.RemoveAll(filepath.Join(dir, name) + ".db")
} }
func testBackendGetSetDelete(t *testing.T, backend dbBackendType) { func testBackendGetSetDelete(t *testing.T, backend DbBackendType) {
// Default // Default
dir, dirname := cmn.Tempdir(fmt.Sprintf("test_backend_%s_", backend)) dir, dirname := cmn.Tempdir(fmt.Sprintf("test_backend_%s_", backend))
defer dir.Close() defer dir.Close()

2
db/common_test.go
View File

@ -45,7 +45,7 @@ func checkValuePanics(t *testing.T, itr Iterator) {
assert.Panics(t, func() { itr.Key() }, "checkValuePanics expected panic but didn't") assert.Panics(t, func() { itr.Key() }, "checkValuePanics expected panic but didn't")
} }
func newTempDB(t *testing.T, backend dbBackendType) (db DB) { func newTempDB(t *testing.T, backend DbBackendType) (db DB) {
dir, dirname := cmn.Tempdir("test_go_iterator") dir, dirname := cmn.Tempdir("test_go_iterator")
db = NewDB("testdb", backend, dirname) db = NewDB("testdb", backend, dirname)
dir.Close() dir.Close()

18
db/db.go
View File

@ -5,21 +5,21 @@ import "fmt"
//---------------------------------------- //----------------------------------------
// Main entry // Main entry
type dbBackendType string type DbBackendType string
const ( const (
LevelDBBackend dbBackendType = "leveldb" // legacy, defaults to goleveldb unless +gcc LevelDBBackend DbBackendType = "leveldb" // legacy, defaults to goleveldb unless +gcc
CLevelDBBackend dbBackendType = "cleveldb" CLevelDBBackend DbBackendType = "cleveldb"
GoLevelDBBackend dbBackendType = "goleveldb" GoLevelDBBackend DbBackendType = "goleveldb"
MemDBBackend dbBackendType = "memdb" MemDBBackend DbBackendType = "memdb"
FSDBBackend dbBackendType = "fsdb" // using the filesystem naively FSDBBackend DbBackendType = "fsdb" // using the filesystem naively
) )
type dbCreator func(name string, dir string) (DB, error) type dbCreator func(name string, dir string) (DB, error)
var backends = map[dbBackendType]dbCreator{} var backends = map[DbBackendType]dbCreator{}
func registerDBCreator(backend dbBackendType, creator dbCreator, force bool) { func registerDBCreator(backend DbBackendType, creator dbCreator, force bool) {
_, ok := backends[backend] _, ok := backends[backend]
if !force && ok { if !force && ok {
return return
@ -27,7 +27,7 @@ func registerDBCreator(backend dbBackendType, creator dbCreator, force bool) {
backends[backend] = creator backends[backend] = creator
} }
func NewDB(name string, backend dbBackendType, dir string) DB { func NewDB(name string, backend DbBackendType, dir string) DB {
db, err := backends[backend](name, dir) db, err := backends[backend](name, dir)
if err != nil { if err != nil {
panic(fmt.Sprintf("Error initializing DB: %v", err)) panic(fmt.Sprintf("Error initializing DB: %v", err))