From f6705f02c7df53b9dc036a290ed0c31cc2f030e4 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 23 Jul 2018 23:31:47 -0400 Subject: [PATCH] fixes post merge --- lite/dbprovider.go | 8 ++-- lite/helpers.go | 4 +- lite/proxy/validate_test.go | 11 +---- types/validator_set_test.go | 95 +++++++++++++++++++------------------ 4 files changed, 56 insertions(+), 62 deletions(-) diff --git a/lite/dbprovider.go b/lite/dbprovider.go index 13ad2c61..8392fcea 100644 --- a/lite/dbprovider.go +++ b/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, diff --git a/lite/helpers.go b/lite/helpers.go index c6fe1760..9265aeea 100644 --- a/lite/helpers.go +++ b/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. diff --git a/lite/proxy/validate_test.go b/lite/proxy/validate_test.go index 6ca9035c..1ce4d667 100644 --- a/lite/proxy/validate_test.go +++ b/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 diff --git a/types/validator_set_test.go b/types/validator_set_test.go index 1756f789..ba5fefa2 100644 --- a/types/validator_set_test.go +++ b/types/validator_set_test.go @@ -16,57 +16,58 @@ import ( ) func TestValidatorSetBasic(t *testing.T) { - for _, vset := range []*ValidatorSet{NewValidatorSet([]*Validator{}), NewValidatorSet(nil)} { - assert.Panics(t, func() { vset.IncrementAccum(1) }) + assert.Panics(t, func() { NewValidatorSet([]*Validator{}) }) - assert.EqualValues(t, vset, vset.Copy()) - assert.False(t, vset.HasAddress([]byte("some val"))) - idx, val := vset.GetByAddress([]byte("some val")) - assert.Equal(t, -1, idx) - assert.Nil(t, val) - addr, val := vset.GetByIndex(-100) - assert.Nil(t, addr) - assert.Nil(t, val) - addr, val = vset.GetByIndex(0) - assert.Nil(t, addr) - assert.Nil(t, val) - addr, val = vset.GetByIndex(100) - assert.Nil(t, addr) - assert.Nil(t, val) - assert.Zero(t, vset.Size()) - assert.Equal(t, int64(0), vset.TotalVotingPower()) - assert.Nil(t, vset.GetProposer()) - assert.Nil(t, vset.Hash()) + vset := NewValidatorSet(nil) + assert.Panics(t, func() { vset.IncrementAccum(1) }) - // add - val = randValidator_() - assert.True(t, vset.Add(val)) - assert.True(t, vset.HasAddress(val.Address)) - idx, val2 := vset.GetByAddress(val.Address) - assert.Equal(t, 0, idx) - assert.Equal(t, val, val2) - addr, val2 = vset.GetByIndex(0) - assert.Equal(t, []byte(val.Address), addr) - assert.Equal(t, val, val2) - assert.Equal(t, 1, vset.Size()) - assert.Equal(t, val.VotingPower, vset.TotalVotingPower()) - assert.Equal(t, val, vset.GetProposer()) - assert.NotNil(t, vset.Hash()) - assert.NotPanics(t, func() { vset.IncrementAccum(1) }) + assert.EqualValues(t, vset, vset.Copy()) + assert.False(t, vset.HasAddress([]byte("some val"))) + idx, val := vset.GetByAddress([]byte("some val")) + assert.Equal(t, -1, idx) + assert.Nil(t, val) + addr, val := vset.GetByIndex(-100) + assert.Nil(t, addr) + assert.Nil(t, val) + addr, val = vset.GetByIndex(0) + assert.Nil(t, addr) + assert.Nil(t, val) + addr, val = vset.GetByIndex(100) + assert.Nil(t, addr) + assert.Nil(t, val) + assert.Zero(t, vset.Size()) + assert.Equal(t, int64(0), vset.TotalVotingPower()) + assert.Nil(t, vset.GetProposer()) + assert.Nil(t, vset.Hash()) - // update - assert.False(t, vset.Update(randValidator_())) - val.VotingPower = 100 - assert.True(t, vset.Update(val)) + // add + val = randValidator_() + assert.True(t, vset.Add(val)) + assert.True(t, vset.HasAddress(val.Address)) + idx, val2 := vset.GetByAddress(val.Address) + assert.Equal(t, 0, idx) + assert.Equal(t, val, val2) + addr, val2 = vset.GetByIndex(0) + assert.Equal(t, []byte(val.Address), addr) + assert.Equal(t, val, val2) + assert.Equal(t, 1, vset.Size()) + assert.Equal(t, val.VotingPower, vset.TotalVotingPower()) + assert.Equal(t, val, vset.GetProposer()) + assert.NotNil(t, vset.Hash()) + assert.NotPanics(t, func() { vset.IncrementAccum(1) }) - // remove - val2, removed := vset.Remove(randValidator_().Address) - assert.Nil(t, val2) - assert.False(t, removed) - val2, removed = vset.Remove(val.Address) - assert.Equal(t, val.Address, val2.Address) - assert.True(t, removed) - } + // update + assert.False(t, vset.Update(randValidator_())) + val.VotingPower = 100 + assert.True(t, vset.Update(val)) + + // remove + val2, removed := vset.Remove(randValidator_().Address) + assert.Nil(t, val2) + assert.False(t, removed) + val2, removed = vset.Remove(val.Address) + assert.Equal(t, val.Address, val2.Address) + assert.True(t, removed) } func TestCopy(t *testing.T) {