Merge branch 'main' into add-module-acc

cosmos · May 5, 2023 · 0f38b3f · 0f38b3f
2 parents 0b1b8b3 + 931fbcf
commit 0f38b3f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/tests/integration/aminojson/aminojson_test.go b/tests/integration/aminojson/aminojson_test.go
@@ -91,7 +91,7 @@ func TestAminoJSON_Equivalence(t *testing.T) {
 		distribution.AppModuleBasic{}, evidence.AppModuleBasic{}, feegrantmodule.AppModuleBasic{},
 		gov.AppModuleBasic{}, groupmodule.AppModuleBasic{}, mint.AppModuleBasic{}, params.AppModuleBasic{},
 		slashing.AppModuleBasic{}, staking.AppModuleBasic{}, upgrade.AppModuleBasic{}, vesting.AppModuleBasic{})
-	aj := aminojson.NewAminoJSON()
+	aj := aminojson.NewEncoder()
 
 	for _, tt := range rapidgen.DefaultGeneratedTypes {
 		name := string(tt.Pulsar.ProtoReflect().Descriptor().FullName())
@@ -192,7 +192,7 @@ func TestAminoJSON_LegacyParity(t *testing.T) {
 		bank.AppModuleBasic{}, distribution.AppModuleBasic{}, slashing.AppModuleBasic{}, staking.AppModuleBasic{},
 		vesting.AppModuleBasic{})
 
-	aj := aminojson.NewAminoJSON()
+	aj := aminojson.NewEncoder()
 	addr1 := types.AccAddress("addr1")
 	now := time.Now()
 
@@ -480,7 +480,7 @@ func TestSendAuthorization(t *testing.T) {
 	encCfg := testutil.MakeTestEncodingConfig(auth.AppModuleBasic{}, authzmodule.AppModuleBasic{},
 		distribution.AppModuleBasic{}, bank.AppModuleBasic{})
 
-	aj := aminojson.NewAminoJSON()
+	aj := aminojson.NewEncoder()
 
 	// beware, Coins has as custom MarshalJSON method which changes how nil is handled
 	// nil -> [] (empty list)

diff --git a/tests/integration/aminojson/repeated_test.go b/tests/integration/aminojson/repeated_test.go
@@ -17,7 +17,7 @@ import (
 
 func TestRepeatedFields(t *testing.T) {
 	cdc := codec.NewLegacyAmino()
-	aj := aminojson.NewAminoJSON()
+	aj := aminojson.NewEncoder()
 
 	cases := map[string]struct {
 		gogo    gogoproto.Message

diff --git a/x/auth/tx/config.go b/x/auth/tx/config.go
@@ -142,7 +142,7 @@ func NewTxConfigWithOptions(protoCodec codec.ProtoCodecMarshaler, configOptions
 				panic(err)
 			}
 		case signingtypes.SignMode_SIGN_MODE_LEGACY_AMINO_JSON:
-			aminoJSONEncoder := aminojson.NewAminoJSON()
+			aminoJSONEncoder := aminojson.NewEncoder()
 			handlers[i] = aminojson.NewSignModeHandler(aminojson.SignModeHandlerOptions{
 				FileResolver: signingOpts.FileResolver,
 				TypeResolver: signingOpts.TypeResolver,

diff --git a/x/evidence/go.mod b/x/evidence/go.mod
@@ -6,7 +6,7 @@ require (
 	cosmossdk.io/api v0.4.1
 	cosmossdk.io/core v0.6.1
 	cosmossdk.io/depinject v1.0.0-alpha.3
-	cosmossdk.io/errors v1.0.0-beta.7
+	cosmossdk.io/errors v1.0.0-beta.7.0.20230429155654-3ee8242364e4
 	cosmossdk.io/log v1.1.0
 	cosmossdk.io/math v1.0.0
 	cosmossdk.io/store v0.1.0-alpha.1.0.20230328185921-37ba88872dbc

diff --git a/x/evidence/go.sum b/x/evidence/go.sum
@@ -41,8 +41,8 @@ cosmossdk.io/collections v0.1.0 h1:nzJGeiq32KnZroSrhB6rPifw4I85Cgmzw/YAmr4luv8=
 cosmossdk.io/collections v0.1.0/go.mod h1:xbauc0YsbUF8qKMVeBZl0pFCunxBIhKN/WlxpZ3lBuo=
 cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw=
 cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU=
-cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w=
-cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE=
+cosmossdk.io/errors v1.0.0-beta.7.0.20230429155654-3ee8242364e4 h1:rOy7iw7HlwKc5Af5qIHLXdBx/F98o6du/I/WGwOW6eA=
+cosmossdk.io/errors v1.0.0-beta.7.0.20230429155654-3ee8242364e4/go.mod h1:AwrAxbvuH9FdatzJX463kMYNMVkjujWU/xR+HsimWTw=
 cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0=
 cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4=
 cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw=

diff --git a/x/tx/signing/aminojson/aminojson.go b/x/tx/signing/aminojson/aminojson.go
@@ -42,7 +42,7 @@ func NewSignModeHandler(options SignModeHandlerOptions) *SignModeHandler {
 		h.typeResolver = options.TypeResolver
 	}
 	if options.Encoder == nil {
-		h.encoder = NewAminoJSON()
+		h.encoder = NewEncoder()
 	} else {
 		h.encoder = *options.Encoder
 	}

diff --git a/x/tx/signing/aminojson/aminojson_test.go b/x/tx/signing/aminojson/aminojson_test.go
@@ -106,7 +106,7 @@ func TestAminoJsonSignMode(t *testing.T) {
 func TestNewSignModeHandler(t *testing.T) {
 	handler := aminojson.NewSignModeHandler(aminojson.SignModeHandlerOptions{})
 	require.NotNil(t, handler)
-	aj := aminojson.NewAminoJSON()
+	aj := aminojson.NewEncoder()
 	handler = aminojson.NewSignModeHandler(aminojson.SignModeHandlerOptions{
 		FileResolver: protoregistry.GlobalFiles,
 		TypeResolver: protoregistry.GlobalTypes,

diff --git a/x/tx/signing/aminojson/json_marshal.go b/x/tx/signing/aminojson/json_marshal.go
@@ -25,9 +25,9 @@ type Encoder struct {
 	fieldEncoders   map[string]FieldEncoder
 }
 
-// NewAminoJSON returns a new Encoder capable of serializing protobuf messages to JSON using the Amino JSON encoding
+// NewEncoder returns a new Encoder capable of serializing protobuf messages to JSON using the Amino JSON encoding
 // rules.
-func NewAminoJSON() Encoder {
+func NewEncoder() Encoder {
 	enc := Encoder{
 		scalarEncoders: map[string]FieldEncoder{
 			"cosmos.Dec": cosmosDecEncoder,

diff --git a/x/tx/signing/aminojson/json_marshal_test.go b/x/tx/signing/aminojson/json_marshal_test.go
@@ -29,7 +29,7 @@ func TestAminoJSON_EdgeCases(t *testing.T) {
 	cdc := amino.NewCodec()
 	cdc.RegisterConcrete(&testpb.ABitOfEverything{}, "ABitOfEverything", nil)
 	cdc.RegisterConcrete(&testpb.NestedMessage{}, "NestedMessage", nil)
-	aj := aminojson.NewAminoJSON()
+	aj := aminojson.NewEncoder()
 
 	cases := map[string]struct {
 		msg       proto.Message
@@ -91,7 +91,7 @@ func TestAminoJSON(t *testing.T) {
 		Si64:     -59268425823934,
 		Sf64:     -659101379604211154,
 	}
-	bz, err := aminojson.NewAminoJSON().Marshal(msg)
+	bz, err := aminojson.NewEncoder().Marshal(msg)
 	assert.NilError(t, err)
 	legacyBz, err := cdc.MarshalJSON(msg)
 	assert.NilError(t, err)
@@ -102,7 +102,7 @@ func TestRapid(t *testing.T) {
 	gen := rapidproto.MessageGenerator(&testpb.ABitOfEverything{}, rapidproto.GeneratorOptions{})
 	rapid.Check(t, func(t *rapid.T) {
 		msg := gen.Draw(t, "msg")
-		bz, err := aminojson.NewAminoJSON().Marshal(msg)
+		bz, err := aminojson.NewEncoder().Marshal(msg)
 		assert.NilError(t, err)
 		checkInvariants(t, msg, bz)
 	})