fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 14:52:17 +00:00
Code Issues Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
Ethan Buchman 2018-04-03 22:34:18 +03:00
parent 8813684040
commit 39ff4d22e9
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lite/proxy/validate_test.go
View File

@ -13,13 +13,14 @@ import (
var ( var (
deadBeefTxs = types.Txs{[]byte("DE"), []byte("AD"), []byte("BE"), []byte("EF")} deadBeefTxs = types.Txs{[]byte("DE"), []byte("AD"), []byte("BE"), []byte("EF")}
deadBeefHash = deadBeefTxs.Hash()
deadBeefRipEmd160Hash = deadBeefTxs.Hash() testTime1 = time.Date(2018, 1, 1, 1, 1, 1, 1, time.UTC)
testTime2 = time.Date(2017, 1, 2, 1, 1, 1, 1, time.UTC)
) )
var hdrHeight11Tendermint = &types.Header{ var hdrHeight11 = &types.Header{
Height: 11, Height: 11,
Time: time.Date(2018, 1, 1, 1, 1, 1, 1, time.UTC), Time: testTime1,
ValidatorsHash: []byte("Tendermint"), ValidatorsHash: []byte("Tendermint"),
} }
@ -54,14 +55,14 @@ func TestValidateBlock(t *testing.T) {
// Start Header.Hash mismatch test // Start Header.Hash mismatch test
{ {
block: &types.Block{Header: hdrHeight11Tendermint}, block: &types.Block{Header: hdrHeight11},
commit: lite.Commit{Header: &types.Header{Height: 11}}, commit: lite.Commit{Header: &types.Header{Height: 11}},
wantErr: "Headers don't match", wantErr: "Headers don't match",
}, },
{ {
block: &types.Block{Header: hdrHeight11Tendermint}, block: &types.Block{Header: hdrHeight11},
commit: lite.Commit{Header: hdrHeight11Tendermint}, commit: lite.Commit{Header: hdrHeight11},
}, },
// End Header.Hash mismatch test // End Header.Hash mismatch test
@ -79,7 +80,7 @@ func TestValidateBlock(t *testing.T) {
}, },
{ {
block: &types.Block{ block: &types.Block{
Header: &types.Header{Height: 11, DataHash: deadBeefRipEmd160Hash}, Header: &types.Header{Height: 11, DataHash: deadBeefHash},
Data: &types.Data{Txs: deadBeefTxs}, Data: &types.Data{Txs: deadBeefTxs},
}, },
commit: lite.Commit{ commit: lite.Commit{
@ -136,33 +137,27 @@ func TestValidateBlockMeta(t *testing.T) {
// Start Headers don't match test // Start Headers don't match test
{ {
meta: &types.BlockMeta{Header: hdrHeight11Tendermint}, meta: &types.BlockMeta{Header: hdrHeight11},
commit: lite.Commit{Header: &types.Header{Height: 11}}, commit: lite.Commit{Header: &types.Header{Height: 11}},
wantErr: "Headers don't match", wantErr: "Headers don't match",
}, },
{ {
meta: &types.BlockMeta{Header: hdrHeight11Tendermint}, meta: &types.BlockMeta{Header: hdrHeight11},
commit: lite.Commit{Header: hdrHeight11Tendermint}, commit: lite.Commit{Header: hdrHeight11},
}, },
{ {
meta: &types.BlockMeta{ meta: &types.BlockMeta{
Header: &types.Header{ Header: &types.Header{
Height: 11, Height: 11,
// TODO: (@odeke-em) inquire why ValidatorsHash has to be non-blank
// for the Header to be hashed. Perhaps this is a security hole because
// an aggressor could perhaps pass in headers that don't have
// ValidatorsHash set and we won't be able to validate blocks.
ValidatorsHash: []byte("lite-test"), ValidatorsHash: []byte("lite-test"),
// TODO: (@odeke-em) file an issue with Tendermint to get them to update // TODO: should be able to use empty time after Amino upgrade
// to the latest go-wire, then no more need for this value fill to avoid Time: testTime1,
// the time zero value of less than 1970.
Time: time.Date(2018, 1, 1, 1, 1, 1, 1, time.UTC),
}, },
}, },
commit: lite.Commit{ commit: lite.Commit{
Header: &types.Header{Height: 11, DataHash: deadBeefRipEmd160Hash}, Header: &types.Header{Height: 11, DataHash: deadBeefHash},
}, },
wantErr: "Headers don't match", wantErr: "Headers don't match",
}, },
@ -170,16 +165,16 @@ func TestValidateBlockMeta(t *testing.T) {
{ {
meta: &types.BlockMeta{ meta: &types.BlockMeta{
Header: &types.Header{ Header: &types.Header{
Height: 11, DataHash: deadBeefRipEmd160Hash, Height: 11, DataHash: deadBeefHash,
ValidatorsHash: []byte("Tendermint"), ValidatorsHash: []byte("Tendermint"),
Time: time.Date(2017, 1, 2, 1, 1, 1, 1, time.UTC), Time: testTime1,
}, },
}, },
commit: lite.Commit{ commit: lite.Commit{
Header: &types.Header{ Header: &types.Header{
Height: 11, DataHash: deadBeefRipEmd160Hash, Height: 11, DataHash: deadBeefHash,
ValidatorsHash: []byte("Tendermint"), ValidatorsHash: []byte("Tendermint"),
Time: time.Date(2018, 1, 2, 1, 1, 1, 1, time.UTC), Time: testTime2,
}, },
Commit: &types.Commit{BlockID: types.BlockID{Hash: []byte("DEADBEEF")}}, Commit: &types.Commit{BlockID: types.BlockID{Hash: []byte("DEADBEEF")}},
}, },
@ -189,16 +184,16 @@ func TestValidateBlockMeta(t *testing.T) {
{ {
meta: &types.BlockMeta{ meta: &types.BlockMeta{
Header: &types.Header{ Header: &types.Header{
Height: 11, DataHash: deadBeefRipEmd160Hash, Height: 11, DataHash: deadBeefHash,
ValidatorsHash: []byte("Tendermint"), ValidatorsHash: []byte("Tendermint"),
Time: time.Date(2017, 1, 2, 1, 1, 1, 1, time.UTC), Time: testTime2,
}, },
}, },
commit: lite.Commit{ commit: lite.Commit{
Header: &types.Header{ Header: &types.Header{
Height: 11, DataHash: deadBeefRipEmd160Hash, Height: 11, DataHash: deadBeefHash,
ValidatorsHash: []byte("Tendermint-x"), ValidatorsHash: []byte("Tendermint-x"),
Time: time.Date(2017, 1, 2, 1, 1, 1, 1, time.UTC), Time: testTime2,
}, },
Commit: &types.Commit{BlockID: types.BlockID{Hash: []byte("DEADBEEF")}}, Commit: &types.Commit{BlockID: types.BlockID{Hash: []byte("DEADBEEF")}},
}, },

4
types/block.go
View File

@ -177,7 +177,9 @@ type Header struct {
} }
// Hash returns the hash of the header. // Hash returns the hash of the header.
// Returns nil if ValidatorHash is missing. // Returns nil if ValidatorHash is missing,
// since a Header is not valid unless there is
// a ValidaotrsHash (corresponding to the validator set).
func (h *Header) Hash() cmn.HexBytes { func (h *Header) Hash() cmn.HexBytes {
if h == nil || len(h.ValidatorsHash) == 0 { if h == nil || len(h.ValidatorsHash) == 0 {
return nil return nil