little refactoring

smartfish · Oct 16, 2017 · b758fc6 · b758fc6
1 parent 1f9c0e9
commit b758fc6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/nonce.go b/nonce.go
@@ -77,7 +77,7 @@ func randBytes(n int) []byte {
 	return bts
 }
 
-func newNonce(dest []byte) {
+func putNewNonce(dest []byte) {
 	base64.StdEncoding.Encode(dest, randBytes(nonceKeySize))
 }
 

diff --git a/server.go b/server.go
@@ -535,10 +535,3 @@ func (u Upgrader) Upgrade(conn io.ReadWriter) (hs Handshake, err error) {
 func headerWriterSecVersion(w io.Writer) {
 	w.Write(btsErrorVersion)
 }
-
-func nonZero(a, b int) int {
-	if a != 0 {
-		return a
-	}
-	return b
-}
diff --git a/util.go b/util.go
@@ -304,3 +304,10 @@ func min(a, b int) int {
 	}
 	return b
 }
+
+func nonZero(a, b int) int {
+	if a != 0 {
+		return a
+	}
+	return b
+}