update to tm v0.32.2 compatible

datachainlab · Aug 2, 2019 · 3468376 · 3468376
1 parent 2070ab1
commit 3468376
Show file tree

Hide file tree

Showing 27 changed files with 73 additions and 48 deletions.
diff --git a/cmd/hmd/main.go b/cmd/hmd/main.go
@@ -9,9 +9,9 @@ import (
 	"github.com/spf13/viper"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/cli"
-	"github.com/tendermint/tendermint/libs/db"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/types"
+	db "github.com/tendermint/tm-db"
 
 	"github.com/bluele/hypermint/pkg/app"
 	"github.com/bluele/hypermint/pkg/app/cmd"

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.12
 
 replace (
 	github.com/go-interpreter/wagon v0.0.0 => github.com/perlin-network/wagon v0.3.1-0.20180825141017-f8cb99b55a39
-	github.com/tendermint/tendermint v0.32.2-rc1 => github.com/bluele/tendermint v0.32.2-rc1
+	github.com/tendermint/tendermint v0.32.2-rc2 => github.com/bluele/tendermint v0.32.2-rc2
 )
 
 require (
@@ -17,26 +17,25 @@ require (
 	github.com/deckarep/golang-set v1.7.1 // indirect
 	github.com/ethereum/go-ethereum v1.8.21
 	github.com/fortytw2/leaktest v1.3.0 // indirect
-	github.com/golang/protobuf v1.3.0
+	github.com/golang/protobuf v1.3.2
 	github.com/google/uuid v1.0.0 // indirect
 	github.com/kr/pretty v0.1.0
 	github.com/mattn/go-isatty v0.0.4
 	github.com/mattn/go-shellwords v1.0.5
 	github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
 	github.com/perlin-network/life v0.0.0-20181106205055-98065d82a6ee
-	github.com/pkg/errors v0.8.0
+	github.com/pkg/errors v0.8.1
 	github.com/rjeczalik/notify v0.9.2 // indirect
 	github.com/spf13/cobra v0.0.1
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.0.0
 	github.com/stretchr/testify v1.3.0
 	github.com/tendermint/go-amino v0.14.1
-	github.com/tendermint/iavl v0.12.3-0.20190712145259-c834d3192b52
-	github.com/tendermint/tendermint v0.32.2-rc1
+	github.com/tendermint/iavl v0.12.4
+	github.com/tendermint/tendermint v0.32.2-rc2
+	github.com/tendermint/tm-db v0.1.1
 	github.com/tyler-smith/go-bip39 v0.3.6
 	golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f
-	golang.org/x/net v0.0.0-20190514140710-3ec191127204 // indirect
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
 	golang.org/x/sys v0.0.0-20190516110030-61b9204099cb // indirect
 	golang.org/x/text v0.3.2 // indirect
 	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7

diff --git a/go.sum b/go.sum
diff --git a/pkg/abci/baseapp/baseapp.go b/pkg/abci/baseapp/baseapp.go
@@ -10,7 +10,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/tmhash"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/bluele/hypermint/pkg/abci/codec"

diff --git a/pkg/abci/baseapp/baseapp_test.go b/pkg/abci/baseapp/baseapp_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/tendermint/abci/types"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/bluele/hypermint/pkg/abci/codec"

diff --git a/pkg/abci/baseapp/options.go b/pkg/abci/baseapp/options.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/bluele/hypermint/pkg/abci/store"
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 // File for storing in-package BaseApp optional functions,

diff --git a/pkg/abci/store/cachekvstore_test.go b/pkg/abci/store/cachekvstore_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func newCacheKVStore() CacheKVStore {

diff --git a/pkg/abci/store/dbstoreadapter.go b/pkg/abci/store/dbstoreadapter.go
@@ -4,7 +4,7 @@ import (
 	"io"
 
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 // Wrapper type for dbm.Db with implementation of KVStore

diff --git a/pkg/abci/store/gaskvstore_test.go b/pkg/abci/store/gaskvstore_test.go
@@ -3,7 +3,7 @@ package store
 import (
 	"testing"
 
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
 

diff --git a/pkg/abci/store/iavlstore.go b/pkg/abci/store/iavlstore.go
@@ -9,7 +9,7 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/merkle"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
 )

diff --git a/pkg/abci/store/iavlstore_test.go b/pkg/abci/store/iavlstore_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/tendermint/iavl"
 	abci "github.com/tendermint/tendermint/abci/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
 )

diff --git a/pkg/abci/store/memiterator.go b/pkg/abci/store/memiterator.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 // Iterates over iterKVCache items.

diff --git a/pkg/abci/store/multistoreproof_test.go b/pkg/abci/store/multistoreproof_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func TestVerifyIAVLStoreQueryProof(t *testing.T) {

diff --git a/pkg/abci/store/prefixstore.go b/pkg/abci/store/prefixstore.go
@@ -176,7 +176,7 @@ func (iter *prefixIterator) Close() {
 	iter.iter.Close()
 }
 
-// copied from github.com/tendermint/tendermint/libs/db/prefix_db.go
+// copied from github.com/tendermint/tm-db/prefix_db.go
 func stripPrefix(key []byte, prefix []byte) []byte {
 	if len(key) < len(prefix) || !bytes.Equal(key[:len(prefix)], prefix) {
 		panic("should not happen")
@@ -189,7 +189,7 @@ func cpIncr(bz []byte) []byte {
 	return sdk.PrefixEndBytes(bz)
 }
 
-// copied from github.com/tendermint/tendermint/libs/db/util.go
+// copied from github.com/tendermint/tm-db/util.go
 func cpDecr(bz []byte) (ret []byte) {
 	if len(bz) == 0 {
 		panic("cpDecr expects non-zero bz length")

diff --git a/pkg/abci/store/prefixstore_test.go b/pkg/abci/store/prefixstore_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/tendermint/iavl"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
 )

diff --git a/pkg/abci/store/rootmultistore.go b/pkg/abci/store/rootmultistore.go
@@ -8,7 +8,7 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/merkle"
 	"github.com/tendermint/tendermint/crypto/tmhash"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
 )

diff --git a/pkg/abci/store/rootmultistore_test.go b/pkg/abci/store/rootmultistore_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/merkle"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
 )

diff --git a/pkg/abci/store/tracekvstore_test.go b/pkg/abci/store/tracekvstore_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 var kvPairs = []KVPair{

diff --git a/pkg/abci/store/transientstore.go b/pkg/abci/store/transientstore.go
@@ -2,7 +2,7 @@ package store
 
 import (
 	sdk "github.com/bluele/hypermint/pkg/abci/types"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 var _ KVStore = (*transientStore)(nil)

diff --git a/pkg/abci/types/context_test.go b/pkg/abci/types/context_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/bluele/hypermint/pkg/abci/store"

diff --git a/pkg/abci/types/store.go b/pkg/abci/types/store.go
@@ -7,7 +7,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 // NOTE: These are implemented in cosmos-sdk/store.

diff --git a/pkg/app/chain.go b/pkg/app/chain.go
@@ -12,7 +12,7 @@ import (
 	amino "github.com/tendermint/go-amino"
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/libs/common"
-	"github.com/tendermint/tendermint/libs/db"
+	"github.com/tendermint/tm-db"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/types"
 	tmtypes "github.com/tendermint/tendermint/types"

diff --git a/pkg/app/cmd/vm.go b/pkg/app/cmd/vm.go
@@ -16,7 +16,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	abci "github.com/tendermint/tendermint/abci/types"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const (

diff --git a/pkg/app/constructors.go b/pkg/app/constructors.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 
 	abci "github.com/tendermint/tendermint/abci/types"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 	"github.com/tendermint/tendermint/libs/log"
 	tmtypes "github.com/tendermint/tendermint/types"
 )

diff --git a/pkg/testutil/store.go b/pkg/testutil/store.go
@@ -3,7 +3,7 @@ package testutil
 import (
 	"github.com/bluele/hypermint/pkg/abci/store"
 	"github.com/bluele/hypermint/pkg/abci/types"
-	"github.com/tendermint/tendermint/libs/db"
+	"github.com/tendermint/tm-db"
 )
 
 func GetTestCommitMultiStore(key types.StoreKey) (types.CommitMultiStore, error) {

diff --git a/tests/integration/contract/contract_test.go b/tests/integration/contract/contract_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tendermint/libs/db"
+	dbm "github.com/tendermint/tm-db"
 	bip39 "github.com/tyler-smith/go-bip39"
 )
 

diff --git a/tests/integration/helper/node.go b/tests/integration/helper/node.go
@@ -22,7 +22,7 @@ import (
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	"github.com/tendermint/tendermint/libs/db"
+	"github.com/tendermint/tm-db"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/node"
 	"github.com/tendermint/tendermint/rpc/client"