kvserver: use dd helpers in TestFlowControlRaftTransportV2

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/flow_control_raft_transport_test.go

@@ -25,6 +25,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/dd"
 	"github.com/cockroachdb/cockroach/pkg/util"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -45,24 +46,21 @@ type transportControl struct {
 }
 
 func parseNodeID(t *testing.T, d *datadriven.TestData, key string) roachpb.NodeID {
-	var arg string
-	d.ScanArgs(t, key, &arg)
+	arg := dd.ScanArg[string](t, d, key)
 	ni, err := strconv.Atoi(strings.TrimPrefix(arg, "n"))
 	require.NoError(t, err)
 	return roachpb.NodeID(ni)
 }
 
 func parseStoreID(t *testing.T, d *datadriven.TestData, key string) roachpb.StoreID {
-	var arg string
-	d.ScanArgs(t, key, &arg)
+	arg := dd.ScanArg[string](t, d, key)
 	si, err := strconv.Atoi(strings.TrimPrefix(arg, "s"))
 	require.NoError(t, err)
 	return roachpb.StoreID(si)
 }
 
 func parseRangeID(t *testing.T, d *datadriven.TestData, key string) roachpb.RangeID {
-	var arg string
-	d.ScanArgs(t, key, &arg)
+	arg := dd.ScanArg[string](t, d, key)
 	si, err := strconv.Atoi(strings.TrimPrefix(arg, "r"))
 	require.NoError(t, err)
 	return roachpb.RangeID(si)
@@ -71,9 +69,8 @@ func parseRangeID(t *testing.T, d *datadriven.TestData, key string) roachpb.Rang
 func parseReplicaDescriptor(
 	t *testing.T, d *datadriven.TestData, key string,
 ) roachpb.ReplicaDescriptor {
-	var arg string
+	arg := dd.ScanArg[string](t, d, key)
 	var desc roachpb.ReplicaDescriptor
-	d.ScanArgs(t, key, &arg)
 	parts := strings.Split(arg, "/")
 	require.Len(t, parts, 3)
 	ni, err := strconv.Atoi(strings.TrimPrefix(parts[0], "n"))
@@ -200,19 +197,12 @@ func TestFlowControlRaftTransportV2(t *testing.T) {
 
 					case "send":
 						// Parse range=r<int>.
-						var arg string
-						d.ScanArgs(t, "range", &arg)
-						ri, err := strconv.Atoi(strings.TrimPrefix(arg, "r"))
-						require.NoError(t, err)
-						rangeID := roachpb.RangeID(ri)
-
+						rangeID := parseRangeID(t, d, "range")
 						from := parseReplicaDescriptor(t, d, "from") // parse from=n<int>/s<int>/<int>
 						to := parseReplicaDescriptor(t, d, "to")     // parse to=n<int>/s<int>/<int>
 
 						// Parse commit=<int>.
-						d.ScanArgs(t, "commit", &arg)
-						c, err := strconv.Atoi(arg)
-						require.NoError(t, err)
+						c := dd.ScanArg[int](t, d, "commit")
 
 						testutils.SucceedsSoon(t, func() error {
 							if !rttc.Send(from, to, rangeID, raftpb.Message{Commit: uint64(c)}) {