address review commnets

Author: tanmay4l

rpc/ws/client.go

@@ -174,7 +174,7 @@ func getUint64(data []byte, keys ...string) (val uint64, err error) {
 	case jsonparser.Number, jsonparser.String:
 		return strconv.ParseUint(string(v), 10, 64)
 	default:
-		return 0, fmt.Errorf("value is not a number/string: %s", string(v))
+		return 0, fmt.Errorf("value is not a number/string: type=%d data=%s", t, string(v))
 	}
 }
 

rpc/ws/types.go

@@ -20,7 +20,7 @@ package ws
 import (
 	stdjson "encoding/json"
 	"fmt"
-	"math/rand"
+	rand "math/rand/v2"
 	"net/http"
 	"time"
 )
@@ -32,17 +32,17 @@ type request struct {
 	ID      uint64 `json:"id"`
 }
 
-const maxJSONRPCSafeInteger = uint64(1<<53 - 1)
+const maxJSONSafeInteger = uint64(1<<53 - 1)
 
 func newRequest(params []any, method string, configuration map[string]any, shortID bool) *request {
 	if params != nil && configuration != nil {
 		params = append(params, configuration)
 	}
 	var ID uint64
 	if !shortID {
-		ID = uint64(rand.Int63n(int64(maxJSONRPCSafeInteger + 1)))
+		ID = rand.Uint64N(maxJSONSafeInteger + 1)
 	} else {
-		ID = uint64(rand.Int31())
+		ID = uint64(rand.Uint32N(1 << 31))
 	}
 	return &request{
 		Version: "2.0",

rpc/ws/types_test.go

@@ -10,7 +10,7 @@ import (
 func TestNewRequest_IDWithinJSONSafeInteger(t *testing.T) {
 	for range 2_000 {
 		req := newRequest(nil, "slotSubscribe", nil, false)
-		require.LessOrEqual(t, req.ID, maxJSONRPCSafeInteger)
+		require.LessOrEqual(t, req.ID, maxJSONSafeInteger)
 	}
 }