diff --git a/go.mod b/go.mod index 022e710..29c37d5 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.24.0 require ( github.com/gofrs/flock v0.13.0 - github.com/mr-tron/base58 v1.2.0 github.com/plar/go-adaptive-radix-tree/v2 v2.0.4 github.com/stretchr/testify v1.11.1 golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 diff --git a/go.sum b/go.sum index 944392f..b0eb536 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= -github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/plar/go-adaptive-radix-tree/v2 v2.0.4 h1:Viv/uI+PUSY+nXF6uNUYeVjw/6grZG+ngVGGFixjX+U= github.com/plar/go-adaptive-radix-tree/v2 v2.0.4/go.mod h1:8yf9K81YK94H4gKh/K3hCBeC2s4JA/PYgqMkkOadwvk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/segment/segment.go b/segment/segment.go index 6fe3c8f..55fa17f 100644 --- a/segment/segment.go +++ b/segment/segment.go @@ -269,7 +269,7 @@ func (s Segment) Backup(targetDir string) error { } func (s Segment) ForRewrite() (Segment, error) { - randStr, err := randStr(8) + randStr, err := randStr(5) if err != nil { return Segment{}, err } diff --git a/segment/utils.go b/segment/utils.go index 71dbb29..ea4a8ce 100644 --- a/segment/utils.go +++ b/segment/utils.go @@ -2,19 +2,20 @@ package segment import ( "crypto/rand" + "encoding/base32" "fmt" "io" "os" - - "github.com/mr-tron/base58" ) +var randEncode = base32.NewEncoding("0123456789abcdefghijklmnopqrstuv").WithPadding(base32.NoPadding) + func randStr(length int) (string, error) { k := make([]byte, length) if _, err := io.ReadFull(rand.Reader, k); err != nil { return "", fmt.Errorf("rand read: %w", err) } - return base58.Encode(k), nil + return randEncode.EncodeToString(k), nil } func copyFile(src, dst string) error {