Modernize

Author: vitaminmoo

actor.go

@@ -24,15 +24,14 @@ type Actor interface {
 // to start, its type will be equal to its name
 // unless its changed:
 //
-//     start := NewActorStart("worker")
+//	start := NewActorStart("worker")
 //
 // Format names can also be used for more complicated
 // names, just remember to override the type:
 //
-//     start := NewActorStart("worker-%d-group-%d", i, j)
-//     start.Type = "worker"
-//
-func NewActorStart(name string, v ...interface{}) *ActorStart {
+//	start := NewActorStart("worker-%d-group-%d", i, j)
+//	start.Type = "worker"
+func NewActorStart(name string, v ...any) *ActorStart {
 	fullName := name
 	if len(v) > 0 {
 		fullName = fmt.Sprintf(name, v...)

cfg.go

@@ -8,7 +8,7 @@ import (
 // Logger hides the logging function Printf behind a simple
 // interface so libraries such as logrus can be used.
 type Logger interface {
-	Printf(string, ...interface{})
+	Printf(string, ...any)
 }
 
 // ClientCfg where the only required argument is Namespace,

client.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
 	"math/rand"
 	"strconv"
 	"strings"
@@ -32,7 +33,7 @@ import (
 //
 //	Register(MyMsg{})    // Correct
 //	Register(&MyMsg{})   // Incorrect
-func Register(v interface{}) error {
+func Register(v any) error {
 	return codec.Register(v)
 }
 
@@ -152,7 +153,7 @@ func (c *Client) Close() error {
 }
 
 // Request a response for the given message. The context can be used to control cancelation or timeouts.
-func (c *Client) Request(ctx context.Context, receiver string, msg interface{}) (interface{}, error) {
+func (c *Client) Request(ctx context.Context, receiver string, msg any) (any, error) {
 	if c == nil {
 		return nil, ErrNilClient
 	}
@@ -382,15 +383,15 @@ func (c *Client) handleGRPCErrs(ctx context.Context, err error, nsReceiver strin
 	return false
 }
 
-func (c *Client) logf(format string, v ...interface{}) {
+func (c *Client) logf(format string, v ...any) {
 	if c.cfg.Logger != nil {
 		c.cfg.Logger.Printf(format, v...)
 	}
 }
 
 // BroadcastC (broadcast) a message to all members in a Group. The context can be used to control
 // cancellations or timeouts
-func (c *Client) Broadcast(ctx context.Context, g *Group, msg interface{}) (BroadcastResult, error) {
+func (c *Client) Broadcast(ctx context.Context, g *Group, msg any) (BroadcastResult, error) {
 	if c == nil {
 		return nil, ErrNilClient
 	}
@@ -403,7 +404,7 @@ func (c *Client) Broadcast(ctx context.Context, g *Group, msg interface{}) (Broa
 	return c.broadcast(cont, cancel, g, msg)
 }
 
-func (c *Client) broadcast(ctx context.Context, cancel context.CancelFunc, g *Group, msg interface{}) (BroadcastResult, error) {
+func (c *Client) broadcast(ctx context.Context, cancel context.CancelFunc, g *Group, msg any) (BroadcastResult, error) {
 	res := make(BroadcastResult)
 	receivers := g.Members()
 
@@ -495,15 +496,13 @@ type BroadcastResult map[string]*Result
 // Result stores the result of a Request
 type Result struct {
 	Err error
-	Val interface{}
+	Val any
 }
 
 // Add combines two BroadcastResults, by overwriting previous
 // results if they exist
 func (b BroadcastResult) Add(other BroadcastResult) {
-	for k, v := range other {
-		b[k] = v
-	}
+	maps.Copy(b, other)
 }
 
 // statName of interesting statistic to track

client_test.go

@@ -217,7 +217,7 @@ func TestClientBroadcast(t *testing.T) {
 
 	// start up the actors
 	const numActors = 2
-	for i := 0; i < numActors; i++ {
+	for i := range numActors {
 		startEchoActor(fmt.Sprintf("echo-%d", i))
 	}
 
@@ -232,7 +232,7 @@ func TestClientBroadcast(t *testing.T) {
 		} else if len(res) != numActors {
 			t.Fatal("expected response")
 		}
-		for i := 0; i < numActors; i++ {
+		for i := range numActors {
 			actor := fmt.Sprintf("echo-%d", i)
 			r, ok := res[actor]
 			if !ok {

codec/registry.go

@@ -22,12 +22,12 @@ var (
 
 var (
 	mu       = &sync.RWMutex{}
-	registry = map[string]interface{}{}
+	registry = map[string]any{}
 )
 
 // Register a type for marshalling and unmarshalling.
 // The type must currently implement proto.Message.
-func Register(v interface{}) error {
+func Register(v any) error {
 	mu.Lock()
 	defer mu.Unlock()
 
@@ -45,9 +45,9 @@ func Register(v interface{}) error {
 	name := TypeName(v)
 	registry[name] = v
 	// TODO(aj) Temporary migration solution for go module upgrade
-	if strings.HasPrefix(name, "github.com/lytics/lio/vendor/") {
+	if after, ok0 := strings.CutPrefix(name, "github.com/lytics/lio/vendor/"); ok0 {
 		// If we're the pre go.mod, register the other namespace
-		otherName := strings.TrimPrefix(name, "github.com/lytics/lio/vendor/")
+		otherName := after
 		registry[otherName] = v
 	} else {
 		// If we're using go.mod, register the old namespace
@@ -59,7 +59,7 @@ func Register(v interface{}) error {
 
 // Marshal the value into bytes. The function returns
 // the type name, the bytes, or an error.
-func Marshal(v interface{}) (string, []byte, error) {
+func Marshal(v any) (string, []byte, error) {
 	mu.RLock()
 	defer mu.RUnlock()
 
@@ -78,7 +78,7 @@ func Marshal(v interface{}) (string, []byte, error) {
 
 // Unmarshal the bytes into a value whos type is given,
 // or return an error.
-func Unmarshal(buf []byte, name string) (interface{}, error) {
+func Unmarshal(buf []byte, name string) (any, error) {
 	mu.RLock()
 	defer mu.RUnlock()
 
@@ -96,7 +96,7 @@ func Unmarshal(buf []byte, name string) (interface{}, error) {
 
 // TypeName of a value. This name is used in the registry
 // to distinguish types.
-func TypeName(v interface{}) string {
+func TypeName(v any) string {
 	rt := reflect.TypeOf(v)
 	pkg := rt.PkgPath()
 	name := rt.Name()
@@ -108,12 +108,12 @@ func TypeName(v interface{}) string {
 	return pkg + "/" + name
 }
 
-func protoMarshal(v interface{}) ([]byte, error) {
+func protoMarshal(v any) ([]byte, error) {
 	pb := v.(proto.Message)
 	return proto.Marshal(pb)
 }
 
-func protoUnmarshal(buf []byte, v interface{}) error {
+func protoUnmarshal(buf []byte, v any) error {
 	pb := v.(proto.Message)
 	return proto.Unmarshal(buf, pb)
 }

mailbox.go

@@ -2,6 +2,7 @@ package grid
 
 import (
 	"errors"
+	"maps"
 	"sync"
 )
 
@@ -63,9 +64,7 @@ func (r *mailboxRegistry) R() map[string]*GRPCMailbox {
 	r.mu.RLock()
 	defer r.mu.RUnlock()
 	out := make(map[string]*GRPCMailbox, len(r.r))
-	for k, v := range r.r {
-		out[k] = v
-	}
+	maps.Copy(out, r.r)
 	return out
 }
 

mailbox_test.go

@@ -98,7 +98,6 @@ func TestMailboxRegistryGetSetDeleteSize(t *testing.T) {
 func TestMailboxRegistryR(t *testing.T) {
 
 	for _, n := range []int{0, 1, 2} {
-		n := n
 		t.Run(strconv.Itoa(n), func(t *testing.T) {
 
 			r := newMailboxRegistry()
@@ -107,7 +106,7 @@ func TestMailboxRegistryR(t *testing.T) {
 			assert.Empty(t, ms)
 
 			msl := make([]*GRPCMailbox, n)
-			for i := 0; i < n; i++ {
+			for i := range n {
 				name := strconv.Itoa(i)
 				m := GRPCMailbox{name: name}
 				msl[i] = &m
@@ -140,15 +139,13 @@ func TestMailboxRegistryConcurrent(t *testing.T) {
 	numKeysSet := []int{1}
 
 	for _, numWorkers := range numWorkersSet {
-		numWorkers := numWorkers
 		for _, numKeys := range numKeysSet {
-			numKeys := numKeys
 			t.Run(fmt.Sprintf("%v-%v", numWorkers, numKeys), func(t *testing.T) {
 
 				r := newMailboxRegistry()
 
 				var wg sync.WaitGroup
-				for i := 0; i < numKeys; i++ {
+				for i := range numKeys {
 					name := strconv.Itoa(i)
 
 					// Add methods you want to test here
@@ -169,10 +166,9 @@ func TestMailboxRegistryConcurrent(t *testing.T) {
 						},
 					}
 
-					for j := 0; j < numWorkers; j++ {
+					for range numWorkers {
 						wg.Add(len(ops))
 						for _, op := range ops {
-							op := op
 							go func() {
 								defer wg.Done()
 								op()

registry/registry.go

@@ -19,7 +19,7 @@ import (
 // interface so libraries such as logrus can be used.
 // Copied from package grid to avoid interndependencies.
 type Logger interface {
-	Printf(string, ...interface{})
+	Printf(string, ...any)
 }
 
 var (
@@ -543,7 +543,7 @@ func (rr *Registry) Deregister(c context.Context, key string) error {
 	return nil
 }
 
-func (rr *Registry) logf(format string, v ...interface{}) {
+func (rr *Registry) logf(format string, v ...any) {
 	if rr.Logger != nil {
 		rr.Logger.Printf(format, v...)
 	}

registry/registry_test.go

@@ -278,7 +278,7 @@ func TestRegisterDeregisterWhileNotStarted(t *testing.T) {
 func TestRegisterTwiceNotAllowed(t *testing.T) {
 	_, r, _ := bootstrap(t, start)
 
-	for i := 0; i < 2; i++ {
+	for i := range 2 {
 		ctx, cancel := timeoutContext()
 		defer cancel()
 		err := r.Register(ctx, "test-registration-twice-b")

request.go

@@ -21,15 +21,15 @@ var (
 // Request which must receive an ack or response.
 type Request interface {
 	Context() context.Context
-	Msg() interface{}
+	Msg() any
 	Ack() error
-	Respond(msg interface{}) error
+	Respond(msg any) error
 }
 
 // newRequest state for use in the server. This actually converts
 // between the "context" and "golang.org/x/net/context" types of
 // Context so that method signatures are satisfied.
-func newRequest(ctx context.Context, msg interface{}) *request {
+func newRequest(ctx context.Context, msg any) *request {
 	return &request{
 		ctx:      ctx,
 		msg:      msg,
@@ -40,7 +40,7 @@ func newRequest(ctx context.Context, msg interface{}) *request {
 
 type request struct {
 	mu       sync.Mutex
-	msg      interface{}
+	msg      any
 	ctx      context.Context
 	failure  chan error
 	response chan *Delivery
@@ -53,7 +53,7 @@ func (req *request) Context() context.Context {
 }
 
 // Msg of the request.
-func (req *request) Msg() interface{} {
+func (req *request) Msg() any {
 	return req.msg
 }
 
@@ -64,7 +64,7 @@ func (req *request) Ack() error {
 }
 
 // Respond to request with a message.
-func (req *request) Respond(msg interface{}) error {
+func (req *request) Respond(msg any) error {
 	req.mu.Lock()
 	defer req.mu.Unlock()