aarifullin/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Pull requests Activity

[#275] reputation/convert: Add nil check

Browse source 
In `SendIntermediateResultRequestBody`
add nil check for `trust` field.
If true, allocate new `PeerToPeerTrust`.

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-04-27 09:52:23 +03:00 committed by Pavel Karpy
parent 0f7a14a69f
commit bb217067f4
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
v2/reputation/convert.go
View file

@ -476,9 +476,18 @@ func (x *SendIntermediateResultRequestBody) FromGRPCMessage(m grpc.Message) erro
return message.NewUnexpectedMessageType(m, v) return message.NewUnexpectedMessageType(m, v)
} }
err := x.trust.FromGRPCMessage(v.GetTrust()) trust := v.GetTrust()
if err != nil { if trust == nil {
return err x.trust = nil
} else {
if x.trust == nil {
x.trust = new(PeerToPeerTrust)
}
err := x.trust.FromGRPCMessage(trust)
if err != nil {
return err
}
} }
x.epoch = v.GetEpoch() x.epoch = v.GetEpoch()

3
v2/reputation/test/generate.go
View file

@ -111,10 +111,9 @@ func GenerateSendIntermediateResultRequestBody(empty bool) *reputation.SendInter
if !empty { if !empty {
m.SetEpoch(123) m.SetEpoch(123)
m.SetIteration(564) m.SetIteration(564)
m.SetTrust(GeneratePeerToPeerTrust(empty))
} }
m.SetTrust(GeneratePeerToPeerTrust(empty))
return m return m
} }