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

chore: finish TODO of removing defunct sortJSON (#16401)

Browse Source
This commit is contained in:
Emmanuel T Odeke 2023-06-10 01:49:11 -07:00 committed by GitHub
parent 4ad71e570d
commit 3db9528efb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
codec/proto_codec.go
View File

@ -2,7 +2,6 @@ package codec
import (
"encoding/binary"
"encoding/json"
"errors"
"fmt"
"strings"
@ -194,27 +193,7 @@ func (pc *ProtoCodec) MarshalAminoJSON(msg gogoproto.Message) ([]byte, error) {
if err != nil {
return nil, err
}
jsonBytes, err := encoder.Marshal(protoMsg)
if err != nil {
return nil, err
}
// TODO: remove this sort once https://github.com/cosmos/cosmos-sdk/issues/2350#issuecomment-1542715157 lands
// the encoder should be rendering in lexical order
return sortJSON(jsonBytes)
}
// sortJSON sorts the JSON keys of the given JSON encoded byte slice.
func sortJSON(toSortJSON []byte) ([]byte, error) {
var c interface{}
err := json.Unmarshal(toSortJSON, &c)
if err != nil {
return nil, err
}
js, err := json.Marshal(c)
if err != nil {
return nil, err
}
return js, nil
return encoder.Marshal(protoMsg)
}
// UnmarshalJSON implements JSONCodec.UnmarshalJSON method,

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

@ -2,7 +2,6 @@ package aminojson
import (
"context"
"encoding/json"
"fmt"
"google.golang.org/protobuf/reflect/protoregistry"
@ -111,27 +110,7 @@ func (h SignModeHandler) GetSignBytes(_ context.Context, signerData signing.Sign
Tip: tip,
}
bz, err := h.encoder.Marshal(signDoc)
if err != nil {
return nil, err
}
// TODO: remove this sort once https://github.com/cosmos/cosmos-sdk/issues/2350#issuecomment-1542715157 lands
// the encoder should be rendering fields in lexical order
return sortJSON(bz)
}
// sortJSON sorts the JSON keys of the given JSON encoded byte slice.
func sortJSON(toSortJSON []byte) ([]byte, error) {
var c interface{}
err := json.Unmarshal(toSortJSON, &c)
if err != nil {
return nil, err
}
js, err := json.Marshal(c)
if err != nil {
return nil, err
}
return js, nil
return h.encoder.Marshal(signDoc)
}
var _ signing.SignModeHandler = (*SignModeHandler)(nil)