LaconicNetwork/cosmos-sdk
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor(x/tx)!: rename aminojson.NewAminoJSON -> aminojson.NewEncoder (#16044)

Browse Source
This commit is contained in:
Matt Kocubinski 2023-05-05 15:47:12 -05:00 committed by GitHub
parent 7aa31f6f8e
commit 931fbcff5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/aminojson/aminojson_test.go
View File

@ -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)

2
tests/integration/aminojson/repeated_test.go
View File

@ -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

2
x/auth/tx/config.go
View File

@ -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,

2
x/tx/signing/aminojson/aminojson.go
View File

@ -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
}

2
x/tx/signing/aminojson/aminojson_test.go
View File

@ -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,

4
x/tx/signing/aminojson/json_marshal.go
View File

@ -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,

6
x/tx/signing/aminojson/json_marshal_test.go
View File

@ -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)
})