[#168] object: Implement binary/JSON encoders/decoders on Header

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-11-13 15:38:55 +03:00 committed by Alex Vanin
parent 78374caa41
commit b8f86f1a60
4 changed files with 45 additions and 5 deletions

View file

@ -64,3 +64,23 @@ func (h *SplitHeader) UnmarshalJSON(data []byte) error {
return nil return nil
} }
func (h *Header) MarshalJSON() ([]byte, error) {
return protojson.MarshalOptions{
EmitUnpopulated: true,
}.Marshal(
HeaderToGRPCMessage(h),
)
}
func (h *Header) UnmarshalJSON(data []byte) error {
msg := new(object.Header)
if err := protojson.Unmarshal(data, msg); err != nil {
return err
}
*h = *HeaderFromGRPCMessage(msg)
return nil
}

View file

@ -42,3 +42,15 @@ func TestSplitHeaderJSON(t *testing.T) {
require.Equal(t, h, h2) require.Equal(t, h, h2)
} }
func TestHeaderJSON(t *testing.T) {
h := generateHeader(10)
data, err := h.MarshalJSON()
require.NoError(t, err)
h2 := new(object.Header)
require.NoError(t, h2.UnmarshalJSON(data))
require.Equal(t, h, h2)
}

View file

@ -422,6 +422,17 @@ func (h *Header) StableSize() (size int) {
return size return size
} }
func (h *Header) Unmarshal(data []byte) error {
m := new(object.Header)
if err := goproto.Unmarshal(data, m); err != nil {
return err
}
*h = *HeaderFromGRPCMessage(m)
return nil
}
func (h *HeaderWithSignature) StableMarshal(buf []byte) ([]byte, error) { func (h *HeaderWithSignature) StableMarshal(buf []byte) ([]byte, error) {
if h == nil { if h == nil {
return []byte{}, nil return []byte{}, nil

View file

@ -65,16 +65,13 @@ func TestHeader_StableMarshal(t *testing.T) {
from := generateHeader(500) from := generateHeader(500)
from.SetSplit(split) from.SetSplit(split)
transport := new(grpc.Header)
t.Run("non empty", func(t *testing.T) { t.Run("non empty", func(t *testing.T) {
wire, err := from.StableMarshal(nil) wire, err := from.StableMarshal(nil)
require.NoError(t, err) require.NoError(t, err)
err = goproto.Unmarshal(wire, transport) to := new(object.Header)
require.NoError(t, err) require.NoError(t, to.Unmarshal(wire))
to := object.HeaderFromGRPCMessage(transport)
require.Equal(t, from, to) require.Equal(t, from, to)
}) })
} }