From c26d7f538927aba9756d54a317c2d393abd2cae6 Mon Sep 17 00:00:00 2001
From: "jianfei.zhang" <jianfei.zhang@daocloud.io>
Date: Tue, 26 Jul 2022 22:07:22 +0800
Subject: [PATCH] fix: code cleanup

Signed-off-by: jianfei.zhang <jianfei.zhang@daocloud.io>
---
 server/auth/simple_token.go | 2 +-
 server/auth/store_test.go   | 2 +-
 server/embed/serve.go       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/auth/simple_token.go b/server/auth/simple_token.go
index 5f66b56d1..fb9485b4f 100644
--- a/server/auth/simple_token.go
+++ b/server/auth/simple_token.go
@@ -236,7 +236,7 @@ func (t *tokenSimple) isValidSimpleToken(ctx context.Context, token string) bool
 	}
 
 	select {
-	case <-t.indexWaiter(uint64(index)):
+	case <-t.indexWaiter(index):
 		return true
 	case <-ctx.Done():
 	}
diff --git a/server/auth/store_test.go b/server/auth/store_test.go
index 498ca0cd1..d47b3426b 100644
--- a/server/auth/store_test.go
+++ b/server/auth/store_test.go
@@ -87,7 +87,7 @@ func TestNewAuthStoreBcryptCost(t *testing.T) {
 
 func encodePassword(s string) string {
 	hashedPassword, _ := bcrypt.GenerateFromPassword([]byte(s), bcrypt.MinCost)
-	return base64.StdEncoding.EncodeToString([]byte(hashedPassword))
+	return base64.StdEncoding.EncodeToString(hashedPassword)
 }
 
 func setupAuthStore(t *testing.T) (store *authStore, teardownfunc func(t *testing.T)) {
diff --git a/server/embed/serve.go b/server/embed/serve.go
index 08a1dc841..7fff618a6 100644
--- a/server/embed/serve.go
+++ b/server/embed/serve.go
@@ -48,6 +48,7 @@ import (
 	"golang.org/x/net/http2"
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 type serveCtx struct {
@@ -137,7 +138,7 @@ func (sctx *serveCtx) serve(
 
 		var gwmux *gw.ServeMux
 		if s.Cfg.EnableGRPCGateway {
-			gwmux, err = sctx.registerGateway([]grpc.DialOption{grpc.WithInsecure()})
+			gwmux, err = sctx.registerGateway([]grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())})
 			if err != nil {
 				sctx.lg.Error("registerGateway failed", zap.Error(err))
 				return err