From bd90d6b34448775e77b21676597c9fb42b1a65d3 Mon Sep 17 00:00:00 2001 From: Riccardo Montagnin Date: Thu, 14 May 2020 15:41:05 +0200 Subject: [PATCH] Merge PR #6219: Different db support --- types/utils.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/types/utils.go b/types/utils.go index f1ef6090b..03cd18a45 100644 --- a/types/utils.go +++ b/types/utils.go @@ -12,8 +12,15 @@ import ( var ( // This is set at compile time. Could be cleveldb, defaults is goleveldb. DBBackend = "" + backend = dbm.GoLevelDBBackend ) +func init() { + if len(DBBackend) != 0 { + backend = dbm.BackendType(DBBackend) + } +} + // SortedJSON takes any JSON and returns it sorted by keys. Also, all white-spaces // are removed. // This method can be used to canonicalize JSON to be returned by GetSignBytes, @@ -79,10 +86,6 @@ func ParseTimeBytes(bz []byte) (time.Time, error) { // NewLevelDB instantiate a new LevelDB instance according to DBBackend. func NewLevelDB(name, dir string) (db dbm.DB, err error) { - backend := dbm.GoLevelDBBackend - if DBBackend == string(dbm.CLevelDBBackend) { - backend = dbm.CLevelDBBackend - } defer func() { if r := recover(); r != nil { err = fmt.Errorf("couldn't create db: %v", r)