unexport rand (#15)

* unexport rand * gofmt
tendermint · Jul 31, 2019 · 94017c8 · 94017c8
1 parent 4fbf5ff
commit 94017c8
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 39 deletions.
diff --git a/backend_test.go b/backend_test.go
@@ -57,7 +57,7 @@ func TestBackendsGetSetDelete(t *testing.T) {
 }
 
 func withDB(t *testing.T, creator dbCreator, fn func(DB)) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	dir := os.TempDir()
 	db, err := creator(name, dir)
 	require.Nil(t, err)
@@ -147,7 +147,7 @@ func TestBackendsNilKeys(t *testing.T) {
 }
 
 func TestGoLevelDBBackend(t *testing.T) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	db := NewDB(name, GoLevelDBBackend, "")
 	defer cleanupDBDir("", name)
 
@@ -164,7 +164,7 @@ func TestDBIterator(t *testing.T) {
 }
 
 func testDBIterator(t *testing.T, backend DBBackendType) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	dir := os.TempDir()
 	db := NewDB(name, backend, dir)
 	defer cleanupDBDir(dir, name)

diff --git a/boltdb_test.go b/boltdb_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestBoltDBNewBoltDB(t *testing.T) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	dir := os.TempDir()
 	defer cleanupDBDir(dir, name)
 
@@ -21,7 +21,7 @@ func TestBoltDBNewBoltDB(t *testing.T) {
 }
 
 func BenchmarkBoltDBRandomReadsWrites(b *testing.B) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	db, err := NewBoltDB(name, "")
 	if err != nil {
 		b.Fatal(err)

diff --git a/c_level_db_test.go b/c_level_db_test.go
@@ -20,7 +20,7 @@ func BenchmarkRandomReadsWrites2(b *testing.B) {
 	for i := 0; i < int(numItems); i++ {
 		internal[int64(i)] = int64(0)
 	}
-	db, err := NewCLevelDB(fmt.Sprintf("test_%x", RandStr(12)), "")
+	db, err := NewCLevelDB(fmt.Sprintf("test_%x", randStr(12)), "")
 	if err != nil {
 		b.Fatal(err.Error())
 		return
@@ -88,7 +88,7 @@ func bytes2Int64(buf []byte) int64 {
 */
 
 func TestCLevelDBBackend(t *testing.T) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	// Can't use "" (current directory) or "./" here because levigo.Open returns:
 	// "Error initializing DB: IO error: test_XXX.db: Invalid argument"
 	dir := os.TempDir()
@@ -100,7 +100,7 @@ func TestCLevelDBBackend(t *testing.T) {
 }
 
 func TestCLevelDBStats(t *testing.T) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	dir := os.TempDir()
 	db := NewDB(name, CLevelDBBackend, dir)
 	defer cleanupDBDir(dir, name)

diff --git a/go_level_db_test.go b/go_level_db_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestGoLevelDBNewGoLevelDB(t *testing.T) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	defer cleanupDBDir("", name)
 
 	// Test we can't open the db twice for writing
@@ -29,7 +29,7 @@ func TestGoLevelDBNewGoLevelDB(t *testing.T) {
 }
 
 func BenchmarkGoLevelDBRandomReadsWrites(b *testing.B) {
-	name := fmt.Sprintf("test_%x", RandStr(12))
+	name := fmt.Sprintf("test_%x", randStr(12))
 	db, err := NewGoLevelDB(name, "")
 	if err != nil {
 		b.Fatal(err)

diff --git a/test_helpers.go b/test_helpers.go
@@ -0,0 +1,31 @@
+package db
+
+import "math/rand"
+
+const (
+	strChars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" // 62 characters
+)
+
+// Str constructs a random alphanumeric string of given length.
+func randStr(length int) string {
+	chars := []byte{}
+MAIN_LOOP:
+	for {
+		val := rand.Int63()
+		for i := 0; i < 10; i++ {
+			v := int(val & 0x3f) // rightmost 6 bits
+			if v >= 62 {         // only 62 characters in strChars
+				val >>= 6
+				continue
+			} else {
+				chars = append(chars, strChars[v])
+				if len(chars) == length {
+					break MAIN_LOOP
+				}
+				val >>= 6
+			}
+		}
+	}
+
+	return string(chars)
+}
diff --git a/util.go b/util.go
@@ -2,7 +2,6 @@ package db
 
 import (
 	"bytes"
-	"math/rand"
 	"os"
 )
 
@@ -50,31 +49,3 @@ func FileExists(filePath string) bool {
 	_, err := os.Stat(filePath)
 	return !os.IsNotExist(err)
 }
-
-const (
-	strChars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" // 62 characters
-)
-
-// Str constructs a random alphanumeric string of given length.
-func RandStr(length int) string {
-	chars := []byte{}
-MAIN_LOOP:
-	for {
-		val := rand.Int63()
-		for i := 0; i < 10; i++ {
-			v := int(val & 0x3f) // rightmost 6 bits
-			if v >= 62 {         // only 62 characters in strChars
-				val >>= 6
-				continue
-			} else {
-				chars = append(chars, strChars[v])
-				if len(chars) == length {
-					break MAIN_LOOP
-				}
-				val >>= 6
-			}
-		}
-	}
-
-	return string(chars)
-}