|
4 | 4 | "crypto/rand"
|
5 | 5 | "encoding/binary"
|
6 | 6 | "strings"
|
7 |
| - |
8 |
| - "golang.org/x/xerrors" |
9 | 7 | )
|
10 | 8 |
|
11 | 9 | // Charsets
|
@@ -34,7 +32,7 @@ const (
|
34 | 32 | Human = "23456789abcdefghjkmnpqrstuvwxyz"
|
35 | 33 | )
|
36 | 34 |
|
37 |
| -// StringCharset generates a random string using the provided charset and size. |
| 35 | +// StringCharset generates a random string using the provided charset and size |
38 | 36 | func StringCharset(charSetStr string, size int) (string, error) {
|
39 | 37 | charSet := []rune(charSetStr)
|
40 | 38 |
|
@@ -69,58 +67,18 @@ func StringCharset(charSetStr string, size int) (string, error) {
|
69 | 67 | return buf.String(), nil
|
70 | 68 | }
|
71 | 69 |
|
72 |
| -// MustStringCharset generates a random string of the given length, using the |
73 |
| -// provided charset. It will panic if an error occurs. |
74 |
| -func MustStringCharset(charSet string, size int) string { |
75 |
| - s, err := StringCharset(charSet, size) |
76 |
| - must(err) |
77 |
| - return s |
78 |
| -} |
79 |
| - |
80 | 70 | // String returns a random string using Default.
|
81 | 71 | func String(size int) (string, error) {
|
82 | 72 | return StringCharset(Default, size)
|
83 | 73 | }
|
84 | 74 |
|
85 |
| -// MustString generates a random string of the given length, using |
86 |
| -// the Default charset. It will panic if an error occurs. |
87 |
| -func MustString(size int) string { |
88 |
| - s, err := String(size) |
89 |
| - must(err) |
90 |
| - return s |
91 |
| -} |
92 |
| - |
93 | 75 | // HexString returns a hexadecimal string of given length.
|
94 | 76 | func HexString(size int) (string, error) {
|
95 | 77 | return StringCharset(Hex, size)
|
96 | 78 | }
|
97 | 79 |
|
98 |
| -// MustHexString generates a random hexadecimal string of the given |
99 |
| -// length. It will panic if an error occurs. |
100 |
| -func MustHexString(size int) string { |
101 |
| - s, err := HexString(size) |
102 |
| - must(err) |
103 |
| - return s |
104 |
| -} |
105 |
| - |
106 |
| -// Sha1String returns a 40-character hexadecimal string, which matches the |
107 |
| -// length of a SHA-1 hash (160 bits). |
| 80 | +// Sha1String returns a 40-character hexadecimal string, which matches |
| 81 | +// the length of a SHA-1 hash (160 bits). |
108 | 82 | func Sha1String() (string, error) {
|
109 | 83 | return StringCharset(Hex, 40)
|
110 | 84 | }
|
111 |
| - |
112 |
| -// MustSha1String returns a 40-character hexadecimal string, which matches the |
113 |
| -// length of a SHA-1 hash (160 bits). It will panic if an error occurs. |
114 |
| -func MustSha1String() string { |
115 |
| - s, err := Sha1String() |
116 |
| - must(err) |
117 |
| - return s |
118 |
| -} |
119 |
| - |
120 |
| -// must is a utility function that panics with the given error if |
121 |
| -// err is non-nil. |
122 |
| -func must(err error) { |
123 |
| - if err != nil { |
124 |
| - panic(xerrors.Errorf("crand: %w", err)) |
125 |
| - } |
126 |
| -} |
0 commit comments