From 8d84ebd14538e6565cc59c3b47513c2bbeae6a08 Mon Sep 17 00:00:00 2001
From: Andy Wang <cbeuw.andy@gmail.com>
Date: Sun, 5 Apr 2020 00:56:43 +0100
Subject: [PATCH] Code styles

---
 internal/client/chrome.go                       |  2 +-
 internal/multiplex/session_test.go              |  6 +++---
 internal/multiplex/streamBuffer_test.go         |  2 +-
 internal/server/usermanager/localmanager_api.go |  2 +-
 release.sh                                      | 10 +++++-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/internal/client/chrome.go b/internal/client/chrome.go
index 3e674a8..ac7ca79 100644
--- a/internal/client/chrome.go
+++ b/internal/client/chrome.go
@@ -16,7 +16,7 @@ func makeGREASE() []byte {
 	var one [1]byte
 	util.CryptoRandRead(one[:])
 	sixteenth := one[0] % 16
-	monoGREASE := byte(sixteenth*16 + 0xA)
+	monoGREASE := sixteenth*16 + 0xA
 	doubleGREASE := []byte{monoGREASE, monoGREASE}
 	return doubleGREASE
 }
diff --git a/internal/multiplex/session_test.go b/internal/multiplex/session_test.go
index e14fe74..34567ae 100644
--- a/internal/multiplex/session_test.go
+++ b/internal/multiplex/session_test.go
@@ -212,7 +212,7 @@ func TestRecvDataFromRemote_Closing_InOrder(t *testing.T) {
 	if err != nil {
 		t.Fatalf("receiving stream closing frame for stream 1: %v", err)
 	}
-	s1I, _ = sesh.streams.Load(f1.StreamID)
+	s1I, _ := sesh.streams.Load(f1.StreamID)
 	if s1I != nil {
 		t.Fatal("stream 1 still exist after receiving stream close")
 	}
@@ -349,7 +349,7 @@ func TestParallel(t *testing.T) {
 
 	numStreams := 10
 	seqs := make([]*uint64, numStreams)
-	for i, _ := range seqs {
+	for i := range seqs {
 		seqs[i] = new(uint64)
 	}
 	randFrame := func() *Frame {
@@ -367,7 +367,7 @@ func TestParallel(t *testing.T) {
 		name  string
 		frame *Frame
 	}, numOfTests)
-	for i, _ := range tests {
+	for i := range tests {
 		tests[i].name = strconv.Itoa(i)
 		tests[i].frame = randFrame()
 	}
diff --git a/internal/multiplex/streamBuffer_test.go b/internal/multiplex/streamBuffer_test.go
index 33a40e3..1df21eb 100644
--- a/internal/multiplex/streamBuffer_test.go
+++ b/internal/multiplex/streamBuffer_test.go
@@ -45,7 +45,7 @@ func TestRecvNewFrame(t *testing.T) {
 		copy(targetSorted, set)
 		sort.Slice(targetSorted, func(i, j int) bool { return targetSorted[i] < targetSorted[j] })
 
-		for i, _ := range targetSorted {
+		for i := range targetSorted {
 			if sortedResult[i] != targetSorted[i] {
 				goto fail
 			}
diff --git a/internal/server/usermanager/localmanager_api.go b/internal/server/usermanager/localmanager_api.go
index 874356b..84f8689 100644
--- a/internal/server/usermanager/localmanager_api.go
+++ b/internal/server/usermanager/localmanager_api.go
@@ -59,7 +59,7 @@ func (manager *localManager) getUserInfoHlr(w http.ResponseWriter, r *http.Reque
 
 	var uinfo UserInfo
 	err = manager.db.View(func(tx *bolt.Tx) error {
-		bucket := tx.Bucket([]byte(UID))
+		bucket := tx.Bucket(UID)
 		if bucket == nil {
 			return ErrUserNotFound
 		}
diff --git a/release.sh b/release.sh
index f3a5d92..a18671b 100755
--- a/release.sh
+++ b/release.sh
@@ -2,7 +2,7 @@ go get github.com/mitchellh/gox
 
 mkdir -p release
 
-read -p "Cleaning $PWD/release directory. Proceed? [y/n]" res
+read -rp "Cleaning $PWD/release directory. Proceed? [y/n]" res
 if [ ! "$res" == "y" ]; then
 	echo "Abort"
 	exit 1
@@ -23,14 +23,14 @@ echo "Compiling:"
 
 os="windows linux darwin"
 arch="amd64 386 arm arm64 mips mips64 mipsle mips64le"
-pushd cmd/ck-client
+pushd cmd/ck-client || exit 1
 gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output"
-GOOS="linux" GOARCH="mips" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mips_softfloat-${v}
-GOOS="linux" GOARCH="mipsle" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mipsle_softfloat-${v}
+GOOS="linux" GOARCH="mips" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mips_softfloat-"${v}"
+GOOS="linux" GOARCH="mipsle" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mipsle_softfloat-"${v}"
 mv ck-client-* ../../release
 
 os="linux"
 arch="amd64 386 arm arm64"
-pushd ../ck-server
+pushd ../ck-server || exit 1
 gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output"
 mv ck-server-* ../../release