chore: modernize sync.WaitGroup usage and use strings.Cut

These updates were found by the modernize tool.

Author: meling

Makefile

@@ -75,6 +75,9 @@ stressgen: tools
 	cd ./internal/testprotos; stress -timeout=10s -p=1 ./testprotos.test
 	rm ./internal/testprotos/testprotos.test
 
+modernize:
+	@go run golang.org/x/tools/go/analysis/passes/modernize/cmd/modernize@latest -fix ./...
+
 # Regenerate all Gorums and protobuf generated files across the repo (dev, benchmark, internal/tests, examples).
 # This will force regeneration even though the proto files have not changed.
 genproto: installgorums dev

cmd/protoc-gen-gorums/gengorums/gorums_func_map.go

@@ -52,8 +52,7 @@ var funcMap = template.FuncMap{
 		if strings.Count(pkgIdent, ".") != 1 {
 			return "EXPECTED PACKAGE NAME AND IDENTIFIER, but got: " + pkgIdent
 		}
-		i := strings.Index(pkgIdent, ".")
-		path, ident := pkgIdent[0:i], pkgIdent[i+1:]
+		path, ident, _ := strings.Cut(pkgIdent, ".")
 		pkg, ok := importMap[path]
 		if !ok {
 			return "IMPORT NOT FOUND: " + path

config_test.go

@@ -223,15 +223,13 @@ func TestConfigConcurrentAccess(t *testing.T) {
 	errCh := make(chan error, 2)
 	var wg sync.WaitGroup
 	for range 2 {
-		wg.Add(1)
-		go func() {
+		wg.Go(func() {
 			node := cfg.Nodes()[0]
 			_, err := node.Test(context.Background(), &dummy.Empty{})
 			if err != nil {
 				errCh <- err
 			}
-			wg.Done()
-		}()
+		})
 	}
 	wg.Wait()
 	close(errCh)

internal/tests/ordering/order_test.go

@@ -159,9 +159,7 @@ func TestQCAsyncOrdering(t *testing.T) {
 	for time.Now().Before(stopTime) {
 		i++
 		promise := cfg.QCAsync(ctx, Request_builder{Num: uint64(i)}.Build())
-		wg.Add(1)
-		go func(promise *AsyncResponse) {
-			defer wg.Done()
+		wg.Go(func() {
 			resp, err := promise.Get()
 			if err != nil {
 				if errors.Is(err, context.Canceled) {
@@ -175,7 +173,7 @@ func TestQCAsyncOrdering(t *testing.T) {
 			if !resp.GetInOrder() && !t.Failed() {
 				t.Errorf("Message received out of order.")
 			}
-		}(promise)
+		})
 	}
 	wg.Wait()
 	cancel()
@@ -202,10 +200,8 @@ func TestMixedOrdering(t *testing.T) {
 			t.Fatalf("Message received out of order.")
 		}
 		var wg sync.WaitGroup
-		wg.Add(len(nodes))
 		for _, node := range nodes {
-			go func(node *Node) {
-				defer wg.Done()
+			wg.Go(func() {
 				resp, err := node.UnaryRPC(context.Background(), Request_builder{Num: uint64(i)}.Build())
 				if err != nil {
 					t.Errorf("RPC error: %v", err)
@@ -218,7 +214,7 @@ func TestMixedOrdering(t *testing.T) {
 					t.Errorf("Message received out of order.")
 					return
 				}
-			}(node)
+			})
 		}
 		wg.Wait()
 		i++