all the refactor

pkg/cart/cart_id_test.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"testing"
+
+	"git.k6n.net/mats/platform/uid"
 )
 
 // TestNewCartIdUniqueness generates many ids and checks for collisions.
@@ -96,26 +98,25 @@ func TestJSONMarshalUnmarshalCartId(t *testing.T) {
 
 // TestBase62LengthBound checks worst-case length (near max uint64).
 func TestBase62LengthBound(t *testing.T) {
-	// Largest uint64
 	const maxU64 = ^uint64(0)
-	s := encodeBase62(maxU64)
+	s := uid.ID(maxU64).String()
 	if len(s) > 11 {
 		t.Fatalf("max uint64 encoded length > 11: %d (%s)", len(s), s)
 	}
-	dec, ok := decodeBase62(s)
-	if !ok || dec != maxU64 {
-		t.Fatalf("decode failed for max uint64: ok=%v dec=%d want=%d", ok, dec, maxU64)
+	dec, ok := uid.Parse(s)
+	if !ok || uint64(dec) != maxU64 {
+		t.Fatalf("decode failed for max uint64: ok=%v dec=%d want=%d", ok, uint64(dec), maxU64)
 	}
 }
 
 // TestZeroEncoding ensures zero value encodes to "0" and parses back.
 func TestZeroEncoding(t *testing.T) {
-	if s := encodeBase62(0); s != "0" {
-		t.Fatalf("encodeBase62(0) expected '0', got %q", s)
+	if s := uid.ID(0).String(); s != "0" {
+		t.Fatalf("uid.ID(0).String() expected '0', got %q", s)
 	}
-	v, ok := decodeBase62("0")
+	v, ok := uid.Parse("0")
 	if !ok || v != 0 {
-		t.Fatalf("decodeBase62('0') failed: ok=%v v=%d", ok, v)
+		t.Fatalf("uid.Parse('0') failed: ok=%v v=%d", ok, v)
 	}
 	if _, ok := ParseCartId("0"); !ok {
 		t.Fatalf("ParseCartId(\"0\") should succeed")
@@ -145,16 +146,14 @@ func BenchmarkNewCartId(b *testing.B) {
 
 // BenchmarkEncodeBase62 measures encoding performance.
 func BenchmarkEncodeBase62(b *testing.B) {
-	// Precompute sample values
 	samples := make([]uint64, 1024)
 	for i := range samples {
-		// Spread bits without crypto randomness overhead
 		samples[i] = (uint64(i) << 53) ^ (uint64(i) * 0x9E3779B185EBCA87)
 	}
 	b.ResetTimer()
 	var sink string
 	for i := 0; i < b.N; i++ {
-		sink = encodeBase62(samples[i%len(samples)])
+		sink = uid.ID(samples[i%len(samples)]).String()
 	}
 	_ = sink
 }
@@ -163,16 +162,16 @@ func BenchmarkEncodeBase62(b *testing.B) {
 func BenchmarkDecodeBase62(b *testing.B) {
 	encoded := make([]string, 1024)
 	for i := range encoded {
-		encoded[i] = encodeBase62((uint64(i) << 32) | uint64(i))
+		encoded[i] = uid.ID((uint64(i) << 32) | uint64(i)).String()
 	}
 	b.ResetTimer()
 	var sum uint64
 	for i := 0; i < b.N; i++ {
-		v, ok := decodeBase62(encoded[i%len(encoded)])
+		v, ok := uid.Parse(encoded[i%len(encoded)])
 		if !ok {
 			b.Fatalf("decode failure for %s", encoded[i%len(encoded)])
 		}
-		sum ^= v
+		sum ^= uint64(v)
 	}
 	_ = sum
 }