use sync.Map :(

Author: facundomedica

x/tx/signing/context.go

@@ -3,6 +3,7 @@ package signing
 import (
 	"errors"
 	"fmt"
+	"sync"
 
 	cosmos_proto "github.com/cosmos/cosmos-proto"
 	gogoproto "github.com/cosmos/gogoproto/proto"
@@ -29,7 +30,7 @@ type Context struct {
 	typeResolver          protoregistry.MessageTypeResolver
 	addressCodec          address.Codec
 	validatorAddressCodec address.Codec
-	getSignersFuncs       map[protoreflect.FullName]GetSignersFunc
+	getSignersFuncs       sync.Map
 	customGetSignerFuncs  map[protoreflect.FullName]GetSignersFunc
 	maxRecursionDepth     int
 }
@@ -110,7 +111,7 @@ func NewContext(options Options) (*Context, error) {
 		typeResolver:          protoTypes,
 		addressCodec:          options.AddressCodec,
 		validatorAddressCodec: options.ValidatorAddressCodec,
-		getSignersFuncs:       map[protoreflect.FullName]GetSignersFunc{},
+		getSignersFuncs:       sync.Map{},
 		customGetSignerFuncs:  customGetSignerFuncs,
 		maxRecursionDepth:     options.MaxRecursionDepth,
 	}
@@ -338,14 +339,17 @@ func (c *Context) getGetSignersFn(messageDescriptor protoreflect.MessageDescript
 	if ok {
 		return f, nil
 	}
-	f, ok = c.getSignersFuncs[messageDescriptor.FullName()]
+
+	loadedFn, ok := c.getSignersFuncs.Load(messageDescriptor.FullName())
 	if !ok {
 		var err error
 		f, err = c.makeGetSignersFunc(messageDescriptor)
 		if err != nil {
 			return nil, err
 		}
-		c.getSignersFuncs[messageDescriptor.FullName()] = f
+		c.getSignersFuncs.Store(messageDescriptor.FullName(), f)
+	} else {
+		f = loadedFn.(GetSignersFunc)
 	}
 
 	return f, nil

x/tx/signing/context_test.go

@@ -58,24 +58,12 @@ func TestGetGetSignersFnConcurrent(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	msg := &bankv1beta1.MsgSend{
-		FromAddress: hex.EncodeToString([]byte("foo")),
-	}
-
-	desc := msg.ProtoReflect().Descriptor()
-
-	// err = ctx.Validate()
-	// require.NoError(t, err)
-
-	for i := 0; i < 100; i++ {
+	desc := (&testpb.RepeatedSigner{}).ProtoReflect().Descriptor()
+	for i := 0; i < 50; i++ {
 		go func() {
 			_, _ = ctx.getGetSignersFn(desc)
 		}()
 	}
-
-	// signers, err := fn(msg)
-	// require.NoError(t, err)
-	// require.Equal(t, [][]byte{[]byte("foo")}, signers)
 }
 
 func TestGetSigners(t *testing.T) {
@@ -277,9 +265,8 @@ func TestDefineCustomGetSigners(t *testing.T) {
 	options.DefineCustomGetSigners(proto.MessageName(simpleSigner), func(msg proto.Message) ([][]byte, error) {
 		return [][]byte{[]byte("qux")}, nil
 	})
-	context, err = NewContext(options)
-	require.NoError(t, err)
-	require.ErrorContains(t, context.Validate(), "a custom signer function as been defined for message SimpleSigner")
+	_, err = NewContext(options)
+	require.ErrorContains(t, err, "a custom signer function as been defined for message SimpleSigner")
 }
 
 type dummyAddressCodec struct{}