|
|
@ -2,10 +2,12 @@ package types |
|
|
|
|
|
|
|
import ( |
|
|
|
"testing" |
|
|
|
"github.com/tendermint/tendermint/types/proto3" |
|
|
|
"github.com/stretchr/testify/assert" |
|
|
|
"github.com/golang/protobuf/proto" |
|
|
|
"time" |
|
|
|
|
|
|
|
"github.com/golang/protobuf/proto" |
|
|
|
"github.com/stretchr/testify/assert" |
|
|
|
|
|
|
|
"github.com/tendermint/tendermint/types/proto3" |
|
|
|
) |
|
|
|
|
|
|
|
func TestProto3Compatibility(t *testing.T) { |
|
|
@ -15,38 +17,37 @@ func TestProto3Compatibility(t *testing.T) { |
|
|
|
nanos := int32(tm.Nanosecond()) |
|
|
|
pbHeader := proto3.Header{ |
|
|
|
ChainID: "cosmos", |
|
|
|
Height:150, |
|
|
|
Time: &proto3.Timestamp{Seconds:seconds, Nanos:nanos}, |
|
|
|
NumTxs: 7, |
|
|
|
Height: 150, |
|
|
|
Time: &proto3.Timestamp{Seconds: seconds, Nanos: nanos}, |
|
|
|
NumTxs: 7, |
|
|
|
LastBlockID: &proto3.BlockID{ |
|
|
|
Hash: []byte("some serious hashing"), |
|
|
|
PartsHeader:&proto3.PartSetHeader{ |
|
|
|
PartsHeader: &proto3.PartSetHeader{ |
|
|
|
Total: 8, |
|
|
|
Hash: []byte("some more serious hashing"), |
|
|
|
Hash: []byte("some more serious hashing"), |
|
|
|
}, |
|
|
|
}, |
|
|
|
TotalTxs: 100, |
|
|
|
TotalTxs: 100, |
|
|
|
LastCommitHash: []byte("commit hash"), |
|
|
|
DataHash: []byte("data hash"), |
|
|
|
ValidatorsHash:[]byte("validators hash"), |
|
|
|
|
|
|
|
DataHash: []byte("data hash"), |
|
|
|
ValidatorsHash: []byte("validators hash"), |
|
|
|
} |
|
|
|
aminoHeader := Header{ |
|
|
|
ChainID: "cosmos", |
|
|
|
Height:150, |
|
|
|
Time: tm, |
|
|
|
NumTxs: 7, |
|
|
|
Height: 150, |
|
|
|
Time: tm, |
|
|
|
NumTxs: 7, |
|
|
|
LastBlockID: BlockID{ |
|
|
|
Hash: []byte("some serious hashing"), |
|
|
|
PartsHeader: PartSetHeader{ |
|
|
|
Total: 8, |
|
|
|
Hash: []byte("some more serious hashing"), |
|
|
|
Hash: []byte("some more serious hashing"), |
|
|
|
}, |
|
|
|
}, |
|
|
|
TotalTxs: 100, |
|
|
|
TotalTxs: 100, |
|
|
|
LastCommitHash: []byte("commit hash"), |
|
|
|
DataHash: []byte("data hash"), |
|
|
|
ValidatorsHash:[]byte("validators hash"), |
|
|
|
DataHash: []byte("data hash"), |
|
|
|
ValidatorsHash: []byte("validators hash"), |
|
|
|
} |
|
|
|
ab, err := cdc.MarshalBinaryBare(aminoHeader) |
|
|
|
assert.NoError(t, err, "unexpected error") |
|
|
@ -58,28 +59,27 @@ func TestProto3Compatibility(t *testing.T) { |
|
|
|
|
|
|
|
emptyLastBlockPb := proto3.Header{ |
|
|
|
ChainID: "cosmos", |
|
|
|
Height:150, |
|
|
|
Time: &proto3.Timestamp{Seconds:seconds, Nanos:nanos}, |
|
|
|
NumTxs: 7, |
|
|
|
Height: 150, |
|
|
|
Time: &proto3.Timestamp{Seconds: seconds, Nanos: nanos}, |
|
|
|
NumTxs: 7, |
|
|
|
// TODO(ismail): as Jae suggested, we'll add a flag to make this obsolete:
|
|
|
|
LastBlockID: &proto3.BlockID{ |
|
|
|
PartsHeader: &proto3.PartSetHeader{}, |
|
|
|
}, |
|
|
|
TotalTxs: 100, |
|
|
|
TotalTxs: 100, |
|
|
|
LastCommitHash: []byte("commit hash"), |
|
|
|
DataHash: []byte("data hash"), |
|
|
|
ValidatorsHash:[]byte("validators hash"), |
|
|
|
|
|
|
|
DataHash: []byte("data hash"), |
|
|
|
ValidatorsHash: []byte("validators hash"), |
|
|
|
} |
|
|
|
emptyLastBlockAm := Header{ |
|
|
|
ChainID: "cosmos", |
|
|
|
Height:150, |
|
|
|
Time: tm, |
|
|
|
NumTxs: 7, |
|
|
|
TotalTxs: 100, |
|
|
|
ChainID: "cosmos", |
|
|
|
Height: 150, |
|
|
|
Time: tm, |
|
|
|
NumTxs: 7, |
|
|
|
TotalTxs: 100, |
|
|
|
LastCommitHash: []byte("commit hash"), |
|
|
|
DataHash: []byte("data hash"), |
|
|
|
ValidatorsHash:[]byte("validators hash"), |
|
|
|
DataHash: []byte("data hash"), |
|
|
|
ValidatorsHash: []byte("validators hash"), |
|
|
|
} |
|
|
|
|
|
|
|
ab, err = cdc.MarshalBinaryBare(emptyLastBlockAm) |
|
|
|