mirror of
https://github.com/eosswedenorg/thalos
synced 2026-06-17 04:30:03 +02:00
api/go.mod: wwitch github.com/shamaton/msgpack/v2 to github.com/ugorji/go/codec
This commit is contained in:
parent
ba05d3d7de
commit
af6d72946f
5 changed files with 80 additions and 1224 deletions
|
|
@ -6,13 +6,10 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/eosswedenorg/thalos/api/message"
|
||||
"github.com/shamaton/msgpack/v2"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestMsgpack_EncodeActionTrace(t *testing.T) {
|
||||
RegisterGeneratedResolver()
|
||||
|
||||
dataJson, err := json.Marshal(map[string]interface{}{
|
||||
"item": map[string]interface{}{
|
||||
"id": "2131242",
|
||||
|
|
@ -45,69 +42,67 @@ func TestMsgpack_EncodeActionTrace(t *testing.T) {
|
|||
Return: []byte{0xde, 0xad, 0xbe, 0xef},
|
||||
}
|
||||
|
||||
data, err := msgpack.Marshal(msg)
|
||||
data, err := encode(msg)
|
||||
assert.NoError(t, err)
|
||||
|
||||
expected := []byte{
|
||||
0x8b, 0xa5, 0x74, 0x78, 0x5f, 0x69, 0x64, 0xd9,
|
||||
0x40, 0x65, 0x64, 0x63, 0x30, 0x36, 0x64, 0x63,
|
||||
0x65, 0x36, 0x33, 0x32, 0x30, 0x34, 0x35, 0x39,
|
||||
0x66, 0x64, 0x36, 0x34, 0x34, 0x37, 0x35, 0x36,
|
||||
0x39, 0x37, 0x32, 0x30, 0x34, 0x38, 0x64, 0x61,
|
||||
0x34, 0x35, 0x33, 0x62, 0x32, 0x38, 0x31, 0x36,
|
||||
0x62, 0x30, 0x61, 0x34, 0x33, 0x34, 0x63, 0x33,
|
||||
0x37, 0x64, 0x64, 0x66, 0x66, 0x64, 0x65, 0x33,
|
||||
0x36, 0x37, 0x37, 0x38, 0x64, 0x63, 0x61, 0x62,
|
||||
0x33, 0xa8, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x6e,
|
||||
0x75, 0x6d, 0xcd, 0x30, 0x39, 0xae, 0x62, 0x6c,
|
||||
0x6f, 0x63, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x73,
|
||||
0x74, 0x61, 0x6d, 0x70, 0xd7, 0xff, 0x77, 0x35,
|
||||
0x94, 0x00, 0x65, 0x4e, 0x19, 0xff, 0xa4, 0x6e,
|
||||
0x61, 0x6d, 0x65, 0xa8, 0x73, 0x65, 0x6c, 0x6c,
|
||||
0x69, 0x74, 0x65, 0x6d, 0xa8, 0x63, 0x6f, 0x6e,
|
||||
0x74, 0x72, 0x61, 0x63, 0x74, 0xa6, 0x6d, 0x79,
|
||||
0x67, 0x61, 0x6d, 0x65, 0xa8, 0x72, 0x65, 0x63,
|
||||
0x65, 0x69, 0x76, 0x65, 0x72, 0xa5, 0x65, 0x6f,
|
||||
0x73, 0x69, 0x6f, 0xa4, 0x64, 0x61, 0x74, 0x61,
|
||||
0xc4, 0x9b, 0x7b, 0x22, 0x61, 0x6d, 0x6f, 0x75,
|
||||
0x6e, 0x74, 0x22, 0x3a, 0x22, 0x31, 0x30, 0x30,
|
||||
0x30, 0x2e, 0x30, 0x30, 0x30, 0x30, 0x20, 0x53,
|
||||
0x43, 0x41, 0x4d, 0x22, 0x2c, 0x22, 0x66, 0x72,
|
||||
0x6f, 0x6d, 0x22, 0x3a, 0x22, 0x61, 0x63, 0x63,
|
||||
0x6f, 0x75, 0x6e, 0x74, 0x31, 0x22, 0x2c, 0x22,
|
||||
0x69, 0x74, 0x65, 0x6d, 0x22, 0x3a, 0x7b, 0x22,
|
||||
0x61, 0x67, 0x69, 0x22, 0x3a, 0x22, 0x32, 0x30,
|
||||
0x22, 0x2c, 0x22, 0x64, 0x75, 0x72, 0x22, 0x3a,
|
||||
0x22, 0x31, 0x30, 0x30, 0x22, 0x2c, 0x22, 0x69,
|
||||
0x64, 0x22, 0x3a, 0x22, 0x32, 0x31, 0x33, 0x31,
|
||||
0x32, 0x34, 0x32, 0x22, 0x2c, 0x22, 0x6e, 0x61,
|
||||
0x6d, 0x65, 0x22, 0x3a, 0x22, 0x47, 0x72, 0x65,
|
||||
0x61, 0x74, 0x20, 0x53, 0x77, 0x6f, 0x72, 0x64,
|
||||
0x22, 0x2c, 0x22, 0x71, 0x75, 0x61, 0x6c, 0x22,
|
||||
0x3a, 0x22, 0x65, 0x70, 0x69, 0x63, 0x22, 0x2c,
|
||||
0x22, 0x73, 0x74, 0x72, 0x22, 0x3a, 0x22, 0x31,
|
||||
0x30, 0x30, 0x22, 0x7d, 0x2c, 0x22, 0x74, 0x6f,
|
||||
0x22, 0x3a, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75,
|
||||
0x6e, 0x74, 0x32, 0x22, 0x7d, 0xad, 0x61, 0x75,
|
||||
0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x91, 0x82, 0xa5, 0x61, 0x63,
|
||||
0x74, 0x6f, 0x72, 0xa6, 0x6d, 0x79, 0x67, 0x61,
|
||||
0x6d, 0x65, 0xaa, 0x70, 0x65, 0x72, 0x6d, 0x69,
|
||||
0x73, 0x73, 0x69, 0x6f, 0x6e, 0xa6, 0x61, 0x63,
|
||||
0x74, 0x69, 0x76, 0x65, 0xa6, 0x65, 0x78, 0x63,
|
||||
0x65, 0x70, 0x74, 0xa6, 0x65, 0x72, 0x72, 0x73,
|
||||
0x74, 0x72, 0xa5, 0x65, 0x72, 0x72, 0x6f, 0x72,
|
||||
0x02, 0xa6, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
|
||||
0xc4, 0x04, 0xde, 0xad, 0xbe, 0xef,
|
||||
0x8b, 0xad, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72,
|
||||
0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x91,
|
||||
0x82, 0xa5, 0x61, 0x63, 0x74, 0x6f, 0x72, 0xa6,
|
||||
0x6d, 0x79, 0x67, 0x61, 0x6d, 0x65, 0xaa, 0x70,
|
||||
0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f,
|
||||
0x6e, 0xa6, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
|
||||
0xa8, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x6e, 0x75,
|
||||
0x6d, 0xcd, 0x30, 0x39, 0xae, 0x62, 0x6c, 0x6f,
|
||||
0x63, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
|
||||
0x61, 0x6d, 0x70, 0xd7, 0xff, 0x77, 0x35, 0x94,
|
||||
0x00, 0x65, 0x4e, 0x19, 0xff, 0xa8, 0x63, 0x6f,
|
||||
0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0xa6, 0x6d,
|
||||
0x79, 0x67, 0x61, 0x6d, 0x65, 0xa4, 0x64, 0x61,
|
||||
0x74, 0x61, 0xc4, 0x9b, 0x7b, 0x22, 0x61, 0x6d,
|
||||
0x6f, 0x75, 0x6e, 0x74, 0x22, 0x3a, 0x22, 0x31,
|
||||
0x30, 0x30, 0x30, 0x2e, 0x30, 0x30, 0x30, 0x30,
|
||||
0x20, 0x53, 0x43, 0x41, 0x4d, 0x22, 0x2c, 0x22,
|
||||
0x66, 0x72, 0x6f, 0x6d, 0x22, 0x3a, 0x22, 0x61,
|
||||
0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x31, 0x22,
|
||||
0x2c, 0x22, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3a,
|
||||
0x7b, 0x22, 0x61, 0x67, 0x69, 0x22, 0x3a, 0x22,
|
||||
0x32, 0x30, 0x22, 0x2c, 0x22, 0x64, 0x75, 0x72,
|
||||
0x22, 0x3a, 0x22, 0x31, 0x30, 0x30, 0x22, 0x2c,
|
||||
0x22, 0x69, 0x64, 0x22, 0x3a, 0x22, 0x32, 0x31,
|
||||
0x33, 0x31, 0x32, 0x34, 0x32, 0x22, 0x2c, 0x22,
|
||||
0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3a, 0x22, 0x47,
|
||||
0x72, 0x65, 0x61, 0x74, 0x20, 0x53, 0x77, 0x6f,
|
||||
0x72, 0x64, 0x22, 0x2c, 0x22, 0x71, 0x75, 0x61,
|
||||
0x6c, 0x22, 0x3a, 0x22, 0x65, 0x70, 0x69, 0x63,
|
||||
0x22, 0x2c, 0x22, 0x73, 0x74, 0x72, 0x22, 0x3a,
|
||||
0x22, 0x31, 0x30, 0x30, 0x22, 0x7d, 0x2c, 0x22,
|
||||
0x74, 0x6f, 0x22, 0x3a, 0x22, 0x61, 0x63, 0x63,
|
||||
0x6f, 0x75, 0x6e, 0x74, 0x32, 0x22, 0x7d, 0xa5,
|
||||
0x65, 0x72, 0x72, 0x6f, 0x72, 0x02, 0xa6, 0x65,
|
||||
0x78, 0x63, 0x65, 0x70, 0x74, 0xa6, 0x65, 0x72,
|
||||
0x72, 0x73, 0x74, 0x72, 0xa4, 0x6e, 0x61, 0x6d,
|
||||
0x65, 0xa8, 0x73, 0x65, 0x6c, 0x6c, 0x69, 0x74,
|
||||
0x65, 0x6d, 0xa8, 0x72, 0x65, 0x63, 0x65, 0x69,
|
||||
0x76, 0x65, 0x72, 0xa5, 0x65, 0x6f, 0x73, 0x69,
|
||||
0x6f, 0xa6, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
|
||||
0xc4, 0x04, 0xde, 0xad, 0xbe, 0xef, 0xa5, 0x74,
|
||||
0x78, 0x5f, 0x69, 0x64, 0xd9, 0x40, 0x65, 0x64,
|
||||
0x63, 0x30, 0x36, 0x64, 0x63, 0x65, 0x36, 0x33,
|
||||
0x32, 0x30, 0x34, 0x35, 0x39, 0x66, 0x64, 0x36,
|
||||
0x34, 0x34, 0x37, 0x35, 0x36, 0x39, 0x37, 0x32,
|
||||
0x30, 0x34, 0x38, 0x64, 0x61, 0x34, 0x35, 0x33,
|
||||
0x62, 0x32, 0x38, 0x31, 0x36, 0x62, 0x30, 0x61,
|
||||
0x34, 0x33, 0x34, 0x63, 0x33, 0x37, 0x64, 0x64,
|
||||
0x66, 0x66, 0x64, 0x65, 0x33, 0x36, 0x37, 0x37,
|
||||
0x38, 0x64, 0x63, 0x61, 0x62, 0x33,
|
||||
}
|
||||
|
||||
assert.Equal(t, expected, data)
|
||||
}
|
||||
|
||||
func TestMsgpack_Decode(t *testing.T) {
|
||||
RegisterGeneratedResolver()
|
||||
|
||||
data := []byte("\x8b\xa5tx_id\xd9@edc06dce6320459fd644756972048da453b2816b0a434c37ddffde36778dcab3\xa8blocknum\xce\x00\x85F7\xaeblocktimestamp\xd6\xffH\xf1U\x1f\xa4name\xa4drop\xa8contract\xa6mygame\xa8receiver\xa8account1\xa4dataċ{\"dropped_from_id\":674562,\"item\":{\"dur\":145,\"id\":49623,\"name\":\"Shadowmourne\",\"qual\":\"legendary\",\"sta\":198,\"str\":223},\"receiver\":\"account1\"}\xadauthorization\x91\x82\xa5actor\xa6mygame\xaapermission\xa6active\xa6except\xa6errstr\xa5error\x02\xa6return\xc4\x04ޭ\xbe\xef")
|
||||
data := []byte("\x8b\xadauthorization\x91\x82\xa5actor\xa6mygame\xaapermission\xa6active\xa8blocknum\xce\x00\x85F7\xaeblocktimestamp\xd6\xffH\xf1U\x1f\xa8contract\xa6mygame\xa4dataċ{\"dropped_from_id\":674562,\"item\":{\"dur\":145,\"id\":49623,\"name\":\"Shadowmourne\",\"qual\":\"legendary\",\"sta\":198,\"str\":223},\"receiver\":\"account1\"}\xa5error\x02\xa6except\xa6errstr\xa4name\xa4drop\xa8receiver\xa8account1\xa6return\xc4\x04ޭ\xbe\xef\xa5tx_id\xd9@edc06dce6320459fd644756972048da453b2816b0a434c37ddffde36778dcab3")
|
||||
|
||||
dataJson, err := json.Marshal(map[string]interface{}{
|
||||
"item": map[string]interface{}{
|
||||
|
|
@ -127,7 +122,7 @@ func TestMsgpack_Decode(t *testing.T) {
|
|||
expected := message.ActionTrace{
|
||||
TxID: "edc06dce6320459fd644756972048da453b2816b0a434c37ddffde36778dcab3",
|
||||
BlockNum: 8734263,
|
||||
Timestamp: time.Unix(1223775519, 0),
|
||||
Timestamp: time.Unix(1223775519, 0).UTC(),
|
||||
Name: "drop",
|
||||
Contract: "mygame",
|
||||
Receiver: "account1",
|
||||
|
|
@ -141,22 +136,20 @@ func TestMsgpack_Decode(t *testing.T) {
|
|||
}
|
||||
|
||||
res := message.ActionTrace{}
|
||||
err = msgpack.Unmarshal(data, &res)
|
||||
err = decode(data, &res)
|
||||
assert.NoError(t, err)
|
||||
|
||||
assert.Equal(t, expected, res)
|
||||
}
|
||||
|
||||
func TestMsgpack_EncodeHeartbeat(t *testing.T) {
|
||||
RegisterGeneratedResolver()
|
||||
|
||||
msg := message.HeartBeat{
|
||||
BlockNum: 1234,
|
||||
HeadBlockNum: 1235,
|
||||
LastIrreversibleBlockNum: 1236,
|
||||
}
|
||||
|
||||
data, err := msgpack.Marshal(msg)
|
||||
data, err := encode(msg)
|
||||
assert.NoError(t, err)
|
||||
|
||||
assert.Equal(t, data, []byte{0x83, 0xa8, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x6e, 0x75, 0x6d, 0xcd, 0x4, 0xd2, 0xad, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x6e, 0x75, 0x6d, 0xcd, 0x4, 0xd3, 0xba, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x69, 0x72, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x6e, 0x75, 0x6d, 0xcd, 0x4, 0xd4})
|
||||
|
|
@ -172,7 +165,7 @@ func TestMsgpack_DecodeHeartbeat(t *testing.T) {
|
|||
}
|
||||
|
||||
msg := message.HeartBeat{}
|
||||
err := msgpack.Unmarshal(data, &msg)
|
||||
err := decode(data, &msg)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, expected, msg)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue