From 362cda53d2b873416951e97379c2398a8c196a9a Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Wed, 16 Mar 2022 15:18:56 +0300 Subject: [PATCH] [#1238] Call `String()` explicitly instead of using stringer pointer Signed-off-by: Alex Vanin --- cmd/neofs-cli/modules/container.go | 2 +- cmd/neofs-cli/modules/object.go | 2 +- cmd/neofs-cli/modules/storagegroup.go | 2 +- pkg/innerring/processors/settlement/audit/calculate.go | 2 +- pkg/services/audit/auditor/por.go | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/neofs-cli/modules/container.go b/cmd/neofs-cli/modules/container.go index 5007f212c..7e48dfc93 100644 --- a/cmd/neofs-cli/modules/container.go +++ b/cmd/neofs-cli/modules/container.go @@ -602,7 +602,7 @@ func getSessionToken(path string) (*session.Token, error) { func prettyPrintContainerList(cmd *cobra.Command, list []cid.ID) { for i := range list { - cmd.Println(&list[i]) // stringer defined on pointer + cmd.Println(list[i].String()) } } diff --git a/cmd/neofs-cli/modules/object.go b/cmd/neofs-cli/modules/object.go index 1d0eb85ef..31e86c6d4 100644 --- a/cmd/neofs-cli/modules/object.go +++ b/cmd/neofs-cli/modules/object.go @@ -894,7 +894,7 @@ func printSplitHeader(cmd *cobra.Command, obj *object.Object) error { } for _, child := range obj.Children() { - cmd.Printf("Split ChildID: %s\n", &child) // stringer defined on pointer + cmd.Printf("Split ChildID: %s\n", child.String()) } if signature := obj.Signature(); signature != nil { diff --git a/cmd/neofs-cli/modules/storagegroup.go b/cmd/neofs-cli/modules/storagegroup.go index 7ff676e5e..b0d71b3dc 100644 --- a/cmd/neofs-cli/modules/storagegroup.go +++ b/cmd/neofs-cli/modules/storagegroup.go @@ -261,7 +261,7 @@ func getSG(cmd *cobra.Command, _ []string) { cmd.Println("Members:") for i := range members { - cmd.Printf("\t%s\n", &members[i]) // stringer defined on pointer + cmd.Printf("\t%s\n", members[i].String()) } } } diff --git a/pkg/innerring/processors/settlement/audit/calculate.go b/pkg/innerring/processors/settlement/audit/calculate.go index f8b59e177..486f5b5f3 100644 --- a/pkg/innerring/processors/settlement/audit/calculate.go +++ b/pkg/innerring/processors/settlement/audit/calculate.go @@ -223,7 +223,7 @@ func (c *Calculator) sumSGSizes(ctx *singleResultCtx) bool { sgInfo, err := c.prm.SGStorage.SGInfo(addr) if err != nil { ctx.log.Error("could not get SG info", - zap.Stringer("id", &passSG[i]), // stringer defined on pointer + zap.String("id", passSG[i].String()), ) return false // we also can continue and calculate at least some part diff --git a/pkg/services/audit/auditor/por.go b/pkg/services/audit/auditor/por.go index d2a7031a5..ce306f1ee 100644 --- a/pkg/services/audit/auditor/por.go +++ b/pkg/services/audit/auditor/por.go @@ -60,7 +60,7 @@ func (c *Context) checkStorageGroupPoR(ind int, sg *oidSDK.ID) { if err != nil { c.log.Info("can't build placement for storage group member", zap.Stringer("sg", sg), - zap.Stringer("member_id", &members[i]), // stringer defined on pointer + zap.String("member_id", members[i].String()), ) continue @@ -82,7 +82,7 @@ func (c *Context) checkStorageGroupPoR(ind int, sg *oidSDK.ID) { if err != nil { c.log.Debug("can't head object", zap.String("remote_node", hex.EncodeToString(flat[j].PublicKey())), - zap.Stringer("oid", &members[i])) // stringer defined on pointer + zap.String("oid", members[i].String())) continue } @@ -99,7 +99,7 @@ func (c *Context) checkStorageGroupPoR(ind int, sg *oidSDK.ID) { }) if err != nil { c.log.Debug("can't concatenate tz hash", - zap.Stringer("oid", &members[i]), // stringer defined on pointer + zap.String("oid", members[i].String()), zap.String("error", err.Error())) break