From aafeb70bdbba01c36fb660613871c454f0653753 Mon Sep 17 00:00:00 2001
From: Alex Vanin <alexey@nspcc.ru>
Date: Wed, 23 Dec 2020 18:45:00 +0300
Subject: [PATCH] [#235] v2/audit: Regenerate protobuf

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
---
 pkg/audit/result.go       |  28 ++++++++++++++++++++++++++++
 pkg/audit/result_test.go  |  10 ++++++++++
 v2/audit/convert.go       |   6 ++++++
 v2/audit/grpc/types.go    |  14 ++++++++++++++
 v2/audit/grpc/types.pb.go | Bin 11822 -> 12607 bytes
 v2/audit/marshal.go       |  18 ++++++++++++++++++
 v2/audit/marshal_test.go  |   2 ++
 v2/audit/types.go         |  38 ++++++++++++++++++++++++++++++++++++++
 8 files changed, 116 insertions(+)

diff --git a/pkg/audit/result.go b/pkg/audit/result.go
index 6f5ea9f5..9ebb564e 100644
--- a/pkg/audit/result.go
+++ b/pkg/audit/result.go
@@ -124,6 +124,34 @@ func (r *Result) SetComplete(v bool) {
 		SetComplete(v)
 }
 
+// Requests returns number of requests made by PoR audit check to get
+// all headers of the objects inside storage groups.
+func (r *Result) Requests() uint32 {
+	return (*audit.DataAuditResult)(r).
+		GetRequests()
+}
+
+// SetRequests sets number of requests made by PoR audit check to get
+// all headers of the objects inside storage groups.
+func (r *Result) SetRequests(v uint32) {
+	(*audit.DataAuditResult)(r).
+		SetRequests(v)
+}
+
+// Retries returns number of retries made by PoR audit check to get
+// all headers of the objects inside storage groups.
+func (r *Result) Retries() uint32 {
+	return (*audit.DataAuditResult)(r).
+		GetRetries()
+}
+
+// SetRetries sets number of retries made by PoR audit check to get
+// all headers of the objects inside storage groups.
+func (r *Result) SetRetries(v uint32) {
+	(*audit.DataAuditResult)(r).
+		SetRetries(v)
+}
+
 // PassSG returns list of Storage Groups that passed audit PoR stage.
 func (r *Result) PassSG() []*object.ID {
 	mV2 := (*audit.DataAuditResult)(r).
diff --git a/pkg/audit/result_test.go b/pkg/audit/result_test.go
index 57038a34..af4a497e 100644
--- a/pkg/audit/result_test.go
+++ b/pkg/audit/result_test.go
@@ -50,6 +50,14 @@ func TestResult(t *testing.T) {
 	r.SetComplete(true)
 	require.True(t, r.Complete())
 
+	requests := uint32(2)
+	r.SetRequests(requests)
+	require.Equal(t, requests, r.Requests())
+
+	retries := uint32(1)
+	r.SetRetries(retries)
+	require.Equal(t, retries, r.Retries())
+
 	passSG := []*object.ID{testOID(), testOID()}
 	r.SetPassSG(passSG)
 	require.Equal(t, passSG, r.PassSG())
@@ -86,6 +94,8 @@ func TestStorageGroupEncoding(t *testing.T) {
 	r.SetPublicKey([]byte{1, 2, 3})
 	r.SetPassSG([]*object.ID{testOID(), testOID()})
 	r.SetFailSG([]*object.ID{testOID(), testOID()})
+	r.SetRequests(3)
+	r.SetRetries(2)
 	r.SetHit(1)
 	r.SetMiss(2)
 	r.SetFail(3)
diff --git a/v2/audit/convert.go b/v2/audit/convert.go
index 43849533..6402041c 100644
--- a/v2/audit/convert.go
+++ b/v2/audit/convert.go
@@ -36,6 +36,9 @@ func DataAuditResultToGRPCMessage(a *DataAuditResult) *audit.DataAuditResult {
 		refs.ObjectIDListToGRPCMessage(a.GetFailSG()),
 	)
 
+	m.SetRequests(a.GetRequests())
+	m.SetRetries(a.GetRetries())
+
 	m.SetHit(a.GetHit())
 	m.SetMiss(a.GetMiss())
 	m.SetFail(a.GetFail())
@@ -77,6 +80,9 @@ func DataAuditResultFromGRPCMessage(m *audit.DataAuditResult) *DataAuditResult {
 		refs.ObjectIDListFromGRPCMessage(m.GetFailSg()),
 	)
 
+	a.SetRequests(m.GetRequests())
+	a.SetRetries(m.GetRetries())
+
 	a.SetHit(m.GetHit())
 	a.SetMiss(m.GetMiss())
 	a.SetFail(m.GetFail())
diff --git a/v2/audit/grpc/types.go b/v2/audit/grpc/types.go
index 2c225efb..d8dd0d12 100644
--- a/v2/audit/grpc/types.go
+++ b/v2/audit/grpc/types.go
@@ -39,6 +39,20 @@ func (x *DataAuditResult) SetComplete(v bool) {
 	}
 }
 
+// SetRequests is a Requests field setter.
+func (x *DataAuditResult) SetRequests(v uint32) {
+	if x != nil {
+		x.Requests = v
+	}
+}
+
+// SetRetries is a Retries field setter.
+func (x *DataAuditResult) SetRetries(v uint32) {
+	if x != nil {
+		x.Retries = v
+	}
+}
+
 // SetPassSg is a PassSg field setter.
 func (x *DataAuditResult) SetPassSg(v []*refs.ObjectID) {
 	if x != nil {
diff --git a/v2/audit/grpc/types.pb.go b/v2/audit/grpc/types.pb.go
index 32daf3a10fdb5ad6dd5ab1b126dc639768317b0a..dddc4412c9966c37c8c54482a5c7ba1b812ab5db 100644
GIT binary patch
delta 906
zcmbVJKWGzS6z2|`++C`zwV`Qpf8O1pu{DvqT$;2RL2wj`X3(Xm7ke!V&DGo$L<iAH
zTm&DuHV)z-SVIuUPEr>KbrHnPK@i+K>G!@1v7n1CAMf{j@BQBIz3;`+cI#y?U0&Q+
zYXuz$SD+Kz*a)H+mcw=cehlZrCPcBn8YprzNkw>D&d=0J;d)$Z`)k3eK}%Fx?}Tya
zS#UiH+b666ja!P!;<$4yi2kn1QzUw{zE_mfe`qGf-E>=+$1&-Nuz)@3D_+TrVpskl
zx-LFcJ_r?TWgZJ2?q+&Iwf}td+lVwY-#&EYH-Ll3)6K*ivcxcEd><!v_K7Ri{?gQ?
zk+ZH}0_Ucayz>;-EA-apc<h!GnNb`JD32$q{N=IB+ngGnH|#tADZytBgc2`xK47nx
zWMslDP<CjDJSNSeQzskMf9YmQZiVfM@29f(PCXz1eo;;K4L{Xsk<rtdjTdqa3U9IS
zqh7=}T9)8v%@*L1?kU_(#UYV~ZsV*r!8&HC<Zce|zLsTO9GWmWKF6<?SY(3%ZKI40
zkR)crp@ZXP!^YEwf+@)1QzM_E{hSsphMR`Y=sZcAP!O(i(gz^o9xyxj3_N9-&Xf4r
zG=bU8p=uWKVqqLbUB_2&cz-Y`p`jkWE@-%I%9zo|@RM04wUk9_$E=eCRypwXN$grh
dBHmgy?qvB<W^5{4w0YqJ4z@Vxf49#lzW}`6`z!ze

delta 440
zcmXYru}cDB7{>XmL+`TGI=$}5yzlPR#p3i#PY!~{ps_X)RBU(3w*G~DAcAOU57Q)?
z!m%NcXe)>i8X9VEXz2S+m+$?a=lwnJ`;HpDYJU*KzPN^QXor*#6|YDcx8f&paW4Im
z3c3p~#6~N8M)LRz4@hCyTl^A+Rrzr~&}a?QYE8gXiUuSRKPk#aM06E3YQb6E#GbZ}
zF^%))jqX7=;$0fys&479=?dF5#h1C+rXF@RDijZMOkL_OnwF|LIo<9Q%lyq3Sc4Ut
z3%iaJBN=r4zl({g;M)kxK3?+OQpLy1Ma0Y`?hH-fvC0e$@s-yGMZ(l@Y$l@9Np(K2
zVDk&!S@X!$hz^)0r|(UNG}y%o<}8^Tla!2{m1V?%<r5F)25HWS7@jSWQ*V~X2qo<k
rUYd)}RJ5s#ewycBr^czWO&ok^I?vTI9KFc+xlzW$k{TIG*)8cG`1p0v

diff --git a/v2/audit/marshal.go b/v2/audit/marshal.go
index 9aedb167..f1a0c599 100644
--- a/v2/audit/marshal.go
+++ b/v2/audit/marshal.go
@@ -14,6 +14,8 @@ const (
 	cidFNum
 	pubKeyFNum
 	completeFNum
+	requestsFNum
+	retriesFNum
 	passSGFNum
 	failSGFNum
 	hitFNum
@@ -74,6 +76,20 @@ func (a *DataAuditResult) StableMarshal(buf []byte) ([]byte, error) {
 
 	offset += n
 
+	n, err = proto.UInt32Marshal(requestsFNum, buf[offset:], a.requests)
+	if err != nil {
+		return nil, err
+	}
+
+	offset += n
+
+	n, err = proto.UInt32Marshal(retriesFNum, buf[offset:], a.retries)
+	if err != nil {
+		return nil, err
+	}
+
+	offset += n
+
 	n, err = refs.ObjectIDNestedListMarshal(passSGFNum, buf[offset:], a.passSG)
 	if err != nil {
 		return nil, err
@@ -136,6 +152,8 @@ func (a *DataAuditResult) StableSize() (size int) {
 	size += proto.NestedStructureSize(cidFNum, a.cid)
 	size += proto.BytesSize(pubKeyFNum, a.pubKey)
 	size += proto.BoolSize(completeFNum, a.complete)
+	size += proto.UInt32Size(requestsFNum, a.requests)
+	size += proto.UInt32Size(retriesFNum, a.retries)
 	size += refs.ObjectIDNestedListSize(passSGFNum, a.passSG)
 	size += refs.ObjectIDNestedListSize(failSGFNum, a.failSG)
 	size += proto.UInt32Size(hitFNum, a.hit)
diff --git a/v2/audit/marshal_test.go b/v2/audit/marshal_test.go
index e9212edd..bac2dbe7 100644
--- a/v2/audit/marshal_test.go
+++ b/v2/audit/marshal_test.go
@@ -43,6 +43,8 @@ func generateDataAuditResult() *audit.DataAuditResult {
 	a.SetContainerID(cid)
 	a.SetPublicKey([]byte("Public key"))
 	a.SetComplete(true)
+	a.SetRequests(10)
+	a.SetRetries(9)
 	a.SetPassSG([]*refs.ObjectID{oid1, oid2})
 	a.SetFailSG([]*refs.ObjectID{oid2, oid1})
 	a.SetHit(1)
diff --git a/v2/audit/types.go b/v2/audit/types.go
index 67a6fd3c..35aa52aa 100644
--- a/v2/audit/types.go
+++ b/v2/audit/types.go
@@ -11,6 +11,8 @@ type DataAuditResult struct {
 
 	auditEpoch uint64
 
+	requests, retries uint32
+
 	hit, miss, fail uint32
 
 	cid *refs.ContainerID
@@ -120,6 +122,42 @@ func (a *DataAuditResult) SetFailSG(v []*refs.ObjectID) {
 	}
 }
 
+// GetRequests returns number of requests made by PoR audit check to get
+// all headers of the objects inside storage groups.
+func (a *DataAuditResult) GetRequests() uint32 {
+	if a != nil {
+		return a.requests
+	}
+
+	return 0
+}
+
+// SetRequests sets number of requests made by PoR audit check to get
+// all headers of the objects inside storage groups.
+func (a *DataAuditResult) SetRequests(v uint32) {
+	if a != nil {
+		a.requests = v
+	}
+}
+
+// GetRetries returns number of retries made by PoR audit check to get
+// all headers of the objects inside storage groups.
+func (a *DataAuditResult) GetRetries() uint32 {
+	if a != nil {
+		return a.retries
+	}
+
+	return 0
+}
+
+// SetRetries sets number of retries made by PoR audit check to get
+// all headers of the objects inside storage groups.
+func (a *DataAuditResult) SetRetries(v uint32) {
+	if a != nil {
+		a.retries = v
+	}
+}
+
 // GetHit returns number of sampled objects under audit placed
 // in an optimal way according to the containers placement policy
 // when checking PoP.