Merge PR #3792: Use DBBackend set at compile time

Alessio Treglia · cwgoes · commit 3e82a8bbb81a · 2019-03-04T21:31:55.000+01:00
* use DBBackend set at compile time Closes: #3719 * Refresh changelog * Tweak Makefile
diff --git a/Makefile b/Makefile
@@ -2,40 +2,24 @@ PACKAGES_NOSIMULATION=$(shell go list ./... | grep -v '/simulation')
 PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
 VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
 COMMIT := $(shell git log -1 --format='%H')
-BUILD_TAGS = netgo
 CAT := $(if $(filter $(OS),Windows_NT),type,cat)
-BUILD_FLAGS = -tags "$(BUILD_TAGS)" -ldflags \
-    '-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-    -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-    -X github.com/cosmos/cosmos-sdk/version.VendorDirHash=$(shell $(CAT) vendor-deps) \
-    -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(BUILD_TAGS)"'
 LEDGER_ENABLED ?= true
 GOTOOLS = \
 	github.com/golang/dep/cmd/dep \
 	github.com/alecthomas/gometalinter \
 	github.com/rakyll/statik
 GOBIN ?= $(GOPATH)/bin
 
-all: devtools vendor-deps install test_lint test
-
-# The below include contains the tools target.
-include scripts/Makefile
-
-########################################
-### CI
-
-ci: devtools vendor-deps install test_cover test_lint test
-
-########################################
-### Build/Install
+# process build tags
 
+build_tags = netgo
 ifeq ($(LEDGER_ENABLED),true)
   ifeq ($(OS),Windows_NT)
     GCCEXE = $(shell where gcc.exe 2> NUL)
     ifeq ($(GCCEXE),)
       $(error gcc.exe not installed for ledger support, please install or set LEDGER_ENABLED=false)
     else
-      BUILD_TAGS += ledger
+      build_tags += ledger
     endif
   else
     UNAME_S = $(shell uname -s)
@@ -46,12 +30,46 @@ ifeq ($(LEDGER_ENABLED),true)
       ifeq ($(GCC),)
         $(error gcc not installed for ledger support, please install or set LEDGER_ENABLED=false)
       else
-        BUILD_TAGS += ledger
+        build_tags += ledger
       endif
     endif
   endif
 endif
 
+ifeq ($(WITH_CLEVELDB),yes)
+  build_tags += gcc
+endif
+build_tags += $(BUILD_TAGS)
+build_tags := $(strip $(build_tags))
+
+# process linker flags
+
+ldflags = -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
+	-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
+  -X github.com/cosmos/cosmos-sdk/version.VendorDirHash=$(shell $(CAT) vendor-deps) \
+  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags)"
+
+ifeq ($(WITH_CLEVELDB),yes)
+  ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb
+endif
+ldflags += $(LDFLAGS)
+ldflags := $(strip $(ldflags))
+
+BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'
+
+all: devtools vendor-deps install test_lint test
+
+# The below include contains the tools target.
+include scripts/Makefile
+
+########################################
+### CI
+
+ci: devtools vendor-deps install test_cover test_lint test
+
+########################################
+### Build/Install
+
 build:
 ifeq ($(OS),Windows_NT)
 	go build $(BUILD_FLAGS) -o build/gaiad.exe ./cmd/gaia/cmd/gaiad
diff --git a/PENDING.md b/PENDING.md
@@ -40,6 +40,9 @@ tags.
 
 ### SDK
 
+* [\#3719](https://github.com/cosmos/cosmos-sdk/issues/3719) DBBackend can now be set at compile time.
+  Defaults: goleveldb. Supported: cleveldb.
+
 ### Tendermint
 
 <!------------------------------- IMPROVEMENTS ------------------------------->
diff --git a/cmd/gaia/app/sim_test.go b/cmd/gaia/app/sim_test.go
@@ -305,7 +305,7 @@ func BenchmarkFullGaiaSimulation(b *testing.B) {
 
 	var db dbm.DB
 	dir, _ := ioutil.TempDir("", "goleveldb-gaia-sim")
-	db, _ = dbm.NewGoLevelDB("Simulation", dir)
+	db, _ = sdk.NewLevelDB("Simulation", dir)
 	defer func() {
 		db.Close()
 		os.RemoveAll(dir)
@@ -347,7 +347,7 @@ func TestFullGaiaSimulation(t *testing.T) {
 	}
 	var db dbm.DB
 	dir, _ := ioutil.TempDir("", "goleveldb-gaia-sim")
-	db, _ = dbm.NewGoLevelDB("Simulation", dir)
+	db, _ = sdk.NewLevelDB("Simulation", dir)
 	defer func() {
 		db.Close()
 		os.RemoveAll(dir)
@@ -388,7 +388,7 @@ func TestGaiaImportExport(t *testing.T) {
 	}
 	var db dbm.DB
 	dir, _ := ioutil.TempDir("", "goleveldb-gaia-sim")
-	db, _ = dbm.NewGoLevelDB("Simulation", dir)
+	db, _ = sdk.NewLevelDB("Simulation", dir)
 	defer func() {
 		db.Close()
 		os.RemoveAll(dir)
@@ -421,7 +421,7 @@ func TestGaiaImportExport(t *testing.T) {
 	fmt.Printf("Importing genesis...\n")
 
 	newDir, _ := ioutil.TempDir("", "goleveldb-gaia-sim-2")
-	newDB, _ := dbm.NewGoLevelDB("Simulation-2", dir)
+	newDB, _ := sdk.NewLevelDB("Simulation-2", dir)
 	defer func() {
 		newDB.Close()
 		os.RemoveAll(newDir)
@@ -483,7 +483,7 @@ func TestGaiaSimulationAfterImport(t *testing.T) {
 		logger = log.NewNopLogger()
 	}
 	dir, _ := ioutil.TempDir("", "goleveldb-gaia-sim")
-	db, _ := dbm.NewGoLevelDB("Simulation", dir)
+	db, _ := sdk.NewLevelDB("Simulation", dir)
 	defer func() {
 		db.Close()
 		os.RemoveAll(dir)
@@ -525,7 +525,7 @@ func TestGaiaSimulationAfterImport(t *testing.T) {
 	fmt.Printf("Importing genesis...\n")
 
 	newDir, _ := ioutil.TempDir("", "goleveldb-gaia-sim-2")
-	newDB, _ := dbm.NewGoLevelDB("Simulation-2", dir)
+	newDB, _ := sdk.NewLevelDB("Simulation-2", dir)
 	defer func() {
 		newDB.Close()
 		os.RemoveAll(newDir)
diff --git a/cmd/gaia/cmd/gaiadebug/hack.go b/cmd/gaia/cmd/gaiadebug/hack.go
@@ -45,7 +45,7 @@ func runHackCmd(cmd *cobra.Command, args []string) error {
 
 	// load the app
 	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
-	db, err := dbm.NewGoLevelDB("gaia", dataDir)
+	db, err := sdk.NewLevelDB("gaia", dataDir)
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
diff --git a/cmd/gaia/cmd/gaiareplay/main.go b/cmd/gaia/cmd/gaiareplay/main.go
@@ -15,14 +15,14 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	bcm "github.com/tendermint/tendermint/blockchain"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tendermint/libs/db"
 	"github.com/tendermint/tendermint/proxy"
 	tmsm "github.com/tendermint/tendermint/state"
 	tm "github.com/tendermint/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
 	"github.com/cosmos/cosmos-sdk/server"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 var (
@@ -72,22 +72,22 @@ func run(rootDir string) {
 	// App DB
 	// appDB := dbm.NewMemDB()
 	fmt.Println("Opening app database")
-	appDB, err := dbm.NewGoLevelDB("application", dataDir)
+	appDB, err := sdk.NewLevelDB("application", dataDir)
 	if err != nil {
 		panic(err)
 	}
 
 	// TM DB
 	// tmDB := dbm.NewMemDB()
 	fmt.Println("Opening tendermint state database")
-	tmDB, err := dbm.NewGoLevelDB("state", dataDir)
+	tmDB, err := sdk.NewLevelDB("state", dataDir)
 	if err != nil {
 		panic(err)
 	}
 
 	// Blockchain DB
 	fmt.Println("Opening blockstore database")
-	bcDB, err := dbm.NewGoLevelDB("blockstore", dataDir)
+	bcDB, err := sdk.NewLevelDB("blockstore", dataDir)
 	if err != nil {
 		panic(err)
 	}
diff --git a/crypto/keys/lazy_keybase.go b/crypto/keys/lazy_keybase.go
@@ -5,10 +5,9 @@ import (
 
 	"github.com/tendermint/tendermint/crypto"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tendermint/libs/db"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/hd"
-	"github.com/cosmos/cosmos-sdk/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 var _ Keybase = lazyKeybase{}
@@ -28,7 +27,7 @@ func New(name, dir string) Keybase {
 }
 
 func (lkb lazyKeybase) List() ([]Info, error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
@@ -38,7 +37,7 @@ func (lkb lazyKeybase) List() ([]Info, error) {
 }
 
 func (lkb lazyKeybase) Get(name string) (Info, error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
@@ -47,8 +46,8 @@ func (lkb lazyKeybase) Get(name string) (Info, error) {
 	return newDbKeybase(db).Get(name)
 }
 
-func (lkb lazyKeybase) GetByAddress(address types.AccAddress) (Info, error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+func (lkb lazyKeybase) GetByAddress(address sdk.AccAddress) (Info, error) {
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
@@ -58,7 +57,7 @@ func (lkb lazyKeybase) GetByAddress(address types.AccAddress) (Info, error) {
 }
 
 func (lkb lazyKeybase) Delete(name, passphrase string, skipPass bool) error {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return err
 	}
@@ -68,7 +67,7 @@ func (lkb lazyKeybase) Delete(name, passphrase string, skipPass bool) error {
 }
 
 func (lkb lazyKeybase) Sign(name, passphrase string, msg []byte) ([]byte, crypto.PubKey, error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -78,7 +77,7 @@ func (lkb lazyKeybase) Sign(name, passphrase string, msg []byte) ([]byte, crypto
 }
 
 func (lkb lazyKeybase) CreateMnemonic(name string, language Language, passwd string, algo SigningAlgo) (info Info, seed string, err error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, "", err
 	}
@@ -88,7 +87,7 @@ func (lkb lazyKeybase) CreateMnemonic(name string, language Language, passwd str
 }
 
 func (lkb lazyKeybase) CreateAccount(name, mnemonic, bip39Passwd, encryptPasswd string, account uint32, index uint32) (Info, error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
@@ -98,7 +97,7 @@ func (lkb lazyKeybase) CreateAccount(name, mnemonic, bip39Passwd, encryptPasswd
 }
 
 func (lkb lazyKeybase) Derive(name, mnemonic, bip39Passwd, encryptPasswd string, params hd.BIP44Params) (Info, error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
@@ -108,7 +107,7 @@ func (lkb lazyKeybase) Derive(name, mnemonic, bip39Passwd, encryptPasswd string,
 }
 
 func (lkb lazyKeybase) CreateLedger(name string, algo SigningAlgo, account uint32, index uint32) (info Info, err error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
@@ -118,7 +117,7 @@ func (lkb lazyKeybase) CreateLedger(name string, algo SigningAlgo, account uint3
 }
 
 func (lkb lazyKeybase) CreateOffline(name string, pubkey crypto.PubKey) (info Info, err error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
@@ -128,7 +127,7 @@ func (lkb lazyKeybase) CreateOffline(name string, pubkey crypto.PubKey) (info In
 }
 
 func (lkb lazyKeybase) CreateMulti(name string, pubkey crypto.PubKey) (info Info, err error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
@@ -138,7 +137,7 @@ func (lkb lazyKeybase) CreateMulti(name string, pubkey crypto.PubKey) (info Info
 }
 
 func (lkb lazyKeybase) Update(name, oldpass string, getNewpass func() (string, error)) error {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return err
 	}
@@ -148,7 +147,7 @@ func (lkb lazyKeybase) Update(name, oldpass string, getNewpass func() (string, e
 }
 
 func (lkb lazyKeybase) Import(name string, armor string) (err error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return err
 	}
@@ -158,7 +157,7 @@ func (lkb lazyKeybase) Import(name string, armor string) (err error) {
 }
 
 func (lkb lazyKeybase) ImportPubKey(name string, armor string) (err error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return err
 	}
@@ -168,7 +167,7 @@ func (lkb lazyKeybase) ImportPubKey(name string, armor string) (err error) {
 }
 
 func (lkb lazyKeybase) Export(name string) (armor string, err error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return "", err
 	}
@@ -178,7 +177,7 @@ func (lkb lazyKeybase) Export(name string) (armor string, err error) {
 }
 
 func (lkb lazyKeybase) ExportPubKey(name string) (armor string, err error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return "", err
 	}
@@ -188,7 +187,7 @@ func (lkb lazyKeybase) ExportPubKey(name string) (armor string, err error) {
 }
 
 func (lkb lazyKeybase) ExportPrivateKeyObject(name string, passphrase string) (crypto.PrivKey, error) {
-	db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)
+	db, err := sdk.NewLevelDB(lkb.name, lkb.dir)
 	if err != nil {
 		return nil, err
 	}
diff --git a/server/constructors.go b/server/constructors.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 	dbm "github.com/tendermint/tendermint/libs/db"
 	"github.com/tendermint/tendermint/libs/log"
@@ -24,7 +25,7 @@ type (
 
 func openDB(rootDir string) (dbm.DB, error) {
 	dataDir := filepath.Join(rootDir, "data")
-	db, err := dbm.NewGoLevelDB("application", dataDir)
+	db, err := sdk.NewLevelDB("application", dataDir)
 	return db, err
 }
 
diff --git a/server/mock/app.go b/server/mock/app.go
diff --git a/types/utils.go b/types/utils.go

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,9 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/tendermint/tendermint/crypto"`
`7`	`7`	`cmn "github.com/tendermint/tendermint/libs/common"`
`8`		`- dbm "github.com/tendermint/tendermint/libs/db"`
`9`	`8`
`10`	`9`	`"github.com/cosmos/cosmos-sdk/crypto/keys/hd"`
`11`		`- "github.com/cosmos/cosmos-sdk/types"`
	`10`	`+ sdk "github.com/cosmos/cosmos-sdk/types"`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`var _ Keybase = lazyKeybase{}`
`@@ -28,7 +27,7 @@ func New(name, dir string) Keybase {`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`func (lkb lazyKeybase) List() ([]Info, error) {`
`31`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`30`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`32`	`31`	`if err != nil {`
`33`	`32`	`return nil, err`
`34`	`33`	`}`
`@@ -38,7 +37,7 @@ func (lkb lazyKeybase) List() ([]Info, error) {`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`func (lkb lazyKeybase) Get(name string) (Info, error) {`
`41`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`40`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`42`	`41`	`if err != nil {`
`43`	`42`	`return nil, err`
`44`	`43`	`}`
`@@ -47,8 +46,8 @@ func (lkb lazyKeybase) Get(name string) (Info, error) {`
`47`	`46`	`return newDbKeybase(db).Get(name)`
`48`	`47`	`}`
`49`	`48`
`50`		`-func (lkb lazyKeybase) GetByAddress(address types.AccAddress) (Info, error) {`
`51`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`49`	`+func (lkb lazyKeybase) GetByAddress(address sdk.AccAddress) (Info, error) {`
	`50`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`52`	`51`	`if err != nil {`
`53`	`52`	`return nil, err`
`54`	`53`	`}`
`@@ -58,7 +57,7 @@ func (lkb lazyKeybase) GetByAddress(address types.AccAddress) (Info, error) {`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`func (lkb lazyKeybase) Delete(name, passphrase string, skipPass bool) error {`
`61`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`60`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`62`	`61`	`if err != nil {`
`63`	`62`	`return err`
`64`	`63`	`}`
`@@ -68,7 +67,7 @@ func (lkb lazyKeybase) Delete(name, passphrase string, skipPass bool) error {`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`func (lkb lazyKeybase) Sign(name, passphrase string, msg []byte) ([]byte, crypto.PubKey, error) {`
`71`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`70`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`72`	`71`	`if err != nil {`
`73`	`72`	`return nil, nil, err`
`74`	`73`	`}`
`@@ -78,7 +77,7 @@ func (lkb lazyKeybase) Sign(name, passphrase string, msg []byte) ([]byte, crypto`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`func (lkb lazyKeybase) CreateMnemonic(name string, language Language, passwd string, algo SigningAlgo) (info Info, seed string, err error) {`
`81`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`80`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`82`	`81`	`if err != nil {`
`83`	`82`	`return nil, "", err`
`84`	`83`	`}`
`@@ -88,7 +87,7 @@ func (lkb lazyKeybase) CreateMnemonic(name string, language Language, passwd str`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`func (lkb lazyKeybase) CreateAccount(name, mnemonic, bip39Passwd, encryptPasswd string, account uint32, index uint32) (Info, error) {`
`91`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`90`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`92`	`91`	`if err != nil {`
`93`	`92`	`return nil, err`
`94`	`93`	`}`
`@@ -98,7 +97,7 @@ func (lkb lazyKeybase) CreateAccount(name, mnemonic, bip39Passwd, encryptPasswd`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`func (lkb lazyKeybase) Derive(name, mnemonic, bip39Passwd, encryptPasswd string, params hd.BIP44Params) (Info, error) {`
`101`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`100`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`102`	`101`	`if err != nil {`
`103`	`102`	`return nil, err`
`104`	`103`	`}`
`@@ -108,7 +107,7 @@ func (lkb lazyKeybase) Derive(name, mnemonic, bip39Passwd, encryptPasswd string,`
`108`	`107`	`}`
`109`	`108`
`110`	`109`	`func (lkb lazyKeybase) CreateLedger(name string, algo SigningAlgo, account uint32, index uint32) (info Info, err error) {`
`111`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`110`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`112`	`111`	`if err != nil {`
`113`	`112`	`return nil, err`
`114`	`113`	`}`
`@@ -118,7 +117,7 @@ func (lkb lazyKeybase) CreateLedger(name string, algo SigningAlgo, account uint3`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`func (lkb lazyKeybase) CreateOffline(name string, pubkey crypto.PubKey) (info Info, err error) {`
`121`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`120`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`122`	`121`	`if err != nil {`
`123`	`122`	`return nil, err`
`124`	`123`	`}`
`@@ -128,7 +127,7 @@ func (lkb lazyKeybase) CreateOffline(name string, pubkey crypto.PubKey) (info In`
`128`	`127`	`}`
`129`	`128`
`130`	`129`	`func (lkb lazyKeybase) CreateMulti(name string, pubkey crypto.PubKey) (info Info, err error) {`
`131`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`130`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`132`	`131`	`if err != nil {`
`133`	`132`	`return nil, err`
`134`	`133`	`}`
`@@ -138,7 +137,7 @@ func (lkb lazyKeybase) CreateMulti(name string, pubkey crypto.PubKey) (info Info`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`func (lkb lazyKeybase) Update(name, oldpass string, getNewpass func() (string, error)) error {`
`141`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`140`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`142`	`141`	`if err != nil {`
`143`	`142`	`return err`
`144`	`143`	`}`
`@@ -148,7 +147,7 @@ func (lkb lazyKeybase) Update(name, oldpass string, getNewpass func() (string, e`
`148`	`147`	`}`
`149`	`148`
`150`	`149`	`func (lkb lazyKeybase) Import(name string, armor string) (err error) {`
`151`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`150`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`152`	`151`	`if err != nil {`
`153`	`152`	`return err`
`154`	`153`	`}`
`@@ -158,7 +157,7 @@ func (lkb lazyKeybase) Import(name string, armor string) (err error) {`
`158`	`157`	`}`
`159`	`158`
`160`	`159`	`func (lkb lazyKeybase) ImportPubKey(name string, armor string) (err error) {`
`161`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`160`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`162`	`161`	`if err != nil {`
`163`	`162`	`return err`
`164`	`163`	`}`
`@@ -168,7 +167,7 @@ func (lkb lazyKeybase) ImportPubKey(name string, armor string) (err error) {`
`168`	`167`	`}`
`169`	`168`
`170`	`169`	`func (lkb lazyKeybase) Export(name string) (armor string, err error) {`
`171`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`170`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`172`	`171`	`if err != nil {`
`173`	`172`	`return "", err`
`174`	`173`	`}`
`@@ -178,7 +177,7 @@ func (lkb lazyKeybase) Export(name string) (armor string, err error) {`
`178`	`177`	`}`
`179`	`178`
`180`	`179`	`func (lkb lazyKeybase) ExportPubKey(name string) (armor string, err error) {`
`181`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`180`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`182`	`181`	`if err != nil {`
`183`	`182`	`return "", err`
`184`	`183`	`}`
`@@ -188,7 +187,7 @@ func (lkb lazyKeybase) ExportPubKey(name string) (armor string, err error) {`
`188`	`187`	`}`
`189`	`188`
`190`	`189`	`func (lkb lazyKeybase) ExportPrivateKeyObject(name string, passphrase string) (crypto.PrivKey, error) {`
`191`		`- db, err := dbm.NewGoLevelDB(lkb.name, lkb.dir)`
	`190`	`+ db, err := sdk.NewLevelDB(lkb.name, lkb.dir)`
`192`	`191`	`if err != nil {`
`193`	`192`	`return nil, err`
`194`	`193`	`}`