From 1a6eaed50f70987508d67587e84117811b5aec27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B3=B0=E5=8F=8B?= <cuichengxu.ccx@antgroup.com>
Date: Wed, 27 Mar 2024 09:03:03 +0000
Subject: [PATCH] fix: golang lint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 泰友 <cuichengxu.ccx@antgroup.com>
---
 smoke/tests/tool/context.go  | 2 +-
 smoke/tests/tool/iterator.go | 5 ++---
 smoke/tests/tool/layer.go    | 6 +++---
 smoke/tests/tool/verify.go   | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/smoke/tests/tool/context.go b/smoke/tests/tool/context.go
index d8f6a6ad4fb..1d6548647d8 100644
--- a/smoke/tests/tool/context.go
+++ b/smoke/tests/tool/context.go
@@ -105,6 +105,6 @@ func (ctx *Context) PrepareWorkDir(t *testing.T) {
 	}
 }
 
-func (ctx *Context) Destroy(t *testing.T) {
+func (ctx *Context) Destroy(_ *testing.T) {
 	os.RemoveAll(ctx.Env.WorkDir)
 }
diff --git a/smoke/tests/tool/iterator.go b/smoke/tests/tool/iterator.go
index bf49e32ef1e..b5bc0099770 100644
--- a/smoke/tests/tool/iterator.go
+++ b/smoke/tests/tool/iterator.go
@@ -129,10 +129,9 @@ func (c *DescartesIterator) calNext() {
 				carried = true
 				cursors[idx]++
 				break
-			} else {
-				carried = false
-				cursors[idx] = 0
 			}
+			carried = false
+			cursors[idx] = 0
 		}
 		if !carried {
 			c.noNext()
diff --git a/smoke/tests/tool/layer.go b/smoke/tests/tool/layer.go
index 7902d5d38ae..3f741005f11 100644
--- a/smoke/tests/tool/layer.go
+++ b/smoke/tests/tool/layer.go
@@ -191,7 +191,7 @@ func (l *Layer) PackRef(t *testing.T, ctx Context, blobDir string, compress bool
 	return ociBlobDigest, rafsBlobDigest
 }
 
-func (l *Layer) Overlay(t *testing.T, upper *Layer) *Layer {
+func (l *Layer) Overlay(_ *testing.T, upper *Layer) *Layer {
 	// Handle whiteout/opaque files
 	for upperName := range upper.FileTree {
 		name := filepath.Base(upperName)
@@ -231,14 +231,14 @@ func (l *Layer) Overlay(t *testing.T, upper *Layer) *Layer {
 
 func (l *Layer) recordFileTree(t *testing.T) {
 	l.FileTree = map[string]*File{}
-	filepath.Walk(l.workDir, func(path string, fi os.FileInfo, err error) error {
+	filepath.Walk(l.workDir, func(path string, _ os.FileInfo, _ error) error {
 		targetPath := l.TargetPath(t, path)
 		l.FileTree[targetPath] = NewFile(t, path, targetPath)
 		return nil
 	})
 }
 
-func (l *Layer) toOCITar(t *testing.T) io.ReadCloser {
+func (l *Layer) toOCITar(_ *testing.T) io.ReadCloser {
 	return archive.Diff(context.Background(), "", l.workDir)
 }
 
diff --git a/smoke/tests/tool/verify.go b/smoke/tests/tool/verify.go
index d2d4ad277d2..b3cd90a3b40 100644
--- a/smoke/tests/tool/verify.go
+++ b/smoke/tests/tool/verify.go
@@ -43,7 +43,7 @@ func Verify(t *testing.T, ctx Context, expectedFiles map[string]*File) {
 	}()
 
 	actualFiles := map[string]*File{}
-	err = filepath.WalkDir(ctx.Env.MountDir, func(path string, entry fs.DirEntry, err error) error {
+	err = filepath.WalkDir(ctx.Env.MountDir, func(path string, _ fs.DirEntry, err error) error {
 		require.Nil(t, err)
 
 		targetPath, err := filepath.Rel(ctx.Env.MountDir, path)