Revert "Merge pull request #247 from tendermint/bucky/no-gogo"

This reverts commit ef79007433, reversing
changes made to bcfdd6dbaf.
This commit is contained in:
Ethan Buchman
2018-05-31 21:45:14 -04:00
parent ef79007433
commit 90c3a469ff
23 changed files with 622 additions and 876 deletions

View File

@ -6,7 +6,7 @@ import (
"strings"
"testing"
"github.com/golang/protobuf/proto"
"github.com/gogo/protobuf/proto"
"github.com/stretchr/testify/assert"
cmn "github.com/tendermint/tmlibs/common"
)
@ -21,7 +21,7 @@ func TestMarshalJSON(t *testing.T) {
Code: 1,
Data: []byte("hello"),
GasWanted: 43,
Tags: []*cmn.KVPair{
Tags: []cmn.KVPair{
{[]byte("pho"), []byte("bo")},
},
}
@ -82,8 +82,8 @@ func TestWriteReadMessage2(t *testing.T) {
Data: []byte(phrase),
Log: phrase,
GasWanted: 10,
Tags: []*cmn.KVPair{
{[]byte("abc"), []byte("def")},
Tags: []cmn.KVPair{
cmn.KVPair{[]byte("abc"), []byte("def")},
},
// Fee: cmn.KI64Pair{
},