fixes post merge

lite/dbprovider.go

@@ -6,11 +6,11 @@ import (
 	"strconv"
 
 	amino "github.com/tendermint/go-amino"
-	crypto "github.com/tendermint/tendermint/crypto"
-	lerr "github.com/tendermint/tendermint/lite/errors"
-	"github.com/tendermint/tendermint/types"
+	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
 	dbm "github.com/tendermint/tendermint/libs/db"
 	log "github.com/tendermint/tendermint/libs/log"
+	lerr "github.com/tendermint/tendermint/lite/errors"
+	"github.com/tendermint/tendermint/types"
 )
 
 type DBProvider struct {
@@ -24,7 +24,7 @@ type DBProvider struct {
 func NewDBProvider(label string, db dbm.DB) *DBProvider {
 	//db = dbm.NewDebugDB("db provider "+cmn.RandStr(4), db)
 	cdc := amino.NewCodec()
-	crypto.RegisterAmino(cdc)
+	cryptoAmino.RegisterAmino(cdc)
 	dbp := &DBProvider{
 		logger: log.NewNopLogger(),
 		label:  label,

lite/helpers.go

@@ -44,7 +44,7 @@ func (pkz privKeys) Extend(n int) privKeys {
 
 // GenSecpPrivKeys produces an array of secp256k1 private keys to generate commits.
 func GenSecpPrivKeys(n int) privKeys {
-	res := make(privKey, n)
+	res := make(privKeys, n)
 	for i := range res {
 		res[i] = secp256k1.GenPrivKey()
 	}
@@ -54,7 +54,7 @@ func GenSecpPrivKeys(n int) privKeys {
 // ExtendSecp adds n more secp256k1 keys (to remove, just take a slice).
 func (pkz privKeys) ExtendSecp(n int) privKeys {
 	extra := GenSecpPrivKeys(n)
-	return append(v, extra...)
+	return append(pkz, extra...)
 }
 
 // ToValidators produces a valset from the set of keys.

lite/proxy/validate_test.go

@@ -33,10 +33,7 @@ func TestValidateBlock(t *testing.T) {
 			block: nil, wantErr: "non-nil Block",
 		},
 		{
-			block: &types.Block{}, wantErr: "nil Header",
-		},
-		{
-			block: &types.Block{Header: new(types.Header)}, wantErr: "unexpected empty SignedHeader",
+			block: &types.Block{}, wantErr: "unexpected empty SignedHeader",
 		},
 
 		// Start Header.Height mismatch test
@@ -115,11 +112,7 @@ func TestValidateBlockMeta(t *testing.T) {
 			meta: nil, wantErr: "non-nil BlockMeta",
 		},
 		{
-			meta: &types.BlockMeta{}, wantErr: "non-nil Header",
-		},
-		{
-			meta: &types.BlockMeta{Header: new(types.Header)}, wantErr: "unexpected empty SignedHeader",
-			//	meta: &types.BlockMeta{},
+			meta: &types.BlockMeta{}, wantErr: "unexpected empty SignedHeader",
 		},
 
 		// Start Header.Height mismatch test