fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-24 22:32:15 +00:00
Code Issues Projects Releases Wiki Activity

update to latest amino (pre) release v0.11.1

Browse Source 
- also reformat code and order imports
This commit is contained in:
Liamsi 2018-07-18 15:53:53 +02:00
parent d665c79cc9
commit 2744682e77
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gopkg.toml
View File

@ -63,7 +63,7 @@
[[constraint]]
name = "github.com/tendermint/go-amino"
version = "=0.10.1"
version = "=v0.11.1"
[[constraint]]
name = "google.golang.org/grpc"

66
types/proto3_test.go
View File

@ -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)