type rename
Some checks failed
Deploy Contract / cleanup-runs (pull_request) Successful in 8s
Deploy Contract / deploy (pull_request) Failing after 55s
Dependency Review / dependency-review (pull_request) Successful in 1m21s
Semgrep / Scan (pull_request) Failing after 16s
Tests / cleanup-runs (pull_request) Successful in 7s
Tests / test-importer (pull_request) Successful in 1m11s
Tests / test-unit-cover (pull_request) Successful in 1m28s
Tests / test-rpc (pull_request) Successful in 57s
Build / cleanup-runs (pull_request) Successful in 6s
Build / build (pull_request) Successful in 1m17s
Tests / sdk_tests (pull_request) Failing after 3m3s
Lint / Run golangci-lint (pull_request) Successful in 1m17s
Lint / Run flake8 on python integration tests (pull_request) Failing after 21s
CodeQL / Analyze (go) (pull_request) Successful in 2m54s
Run Gosec / Gosec (pull_request) Successful in 21s
Pull Request Labeler / triage (pull_request) Failing after 11s
Protobuf / lint (pull_request) Failing after 21s
Protobuf / break-check (pull_request) Failing after 31s
Some checks failed
Deploy Contract / cleanup-runs (pull_request) Successful in 8s
Deploy Contract / deploy (pull_request) Failing after 55s
Dependency Review / dependency-review (pull_request) Successful in 1m21s
Semgrep / Scan (pull_request) Failing after 16s
Tests / cleanup-runs (pull_request) Successful in 7s
Tests / test-importer (pull_request) Successful in 1m11s
Tests / test-unit-cover (pull_request) Successful in 1m28s
Tests / test-rpc (pull_request) Successful in 57s
Build / cleanup-runs (pull_request) Successful in 6s
Build / build (pull_request) Successful in 1m17s
Tests / sdk_tests (pull_request) Failing after 3m3s
Lint / Run golangci-lint (pull_request) Successful in 1m17s
Lint / Run flake8 on python integration tests (pull_request) Failing after 21s
CodeQL / Analyze (go) (pull_request) Successful in 2m54s
Run Gosec / Gosec (pull_request) Successful in 21s
Pull Request Labeler / triage (pull_request) Failing after 11s
Protobuf / lint (pull_request) Failing after 21s
Protobuf / break-check (pull_request) Failing after 31s
This commit is contained in:
parent
d64e80f963
commit
596c309e1f
@ -161,7 +161,7 @@ $ %s query %s list
|
||||
}
|
||||
|
||||
recordsList := res.GetRecords()
|
||||
records := make([]types.RecordEncodable, len(recordsList))
|
||||
records := make([]types.ReadableRecord, len(recordsList))
|
||||
for i, record := range res.GetRecords() {
|
||||
records[i] = record.ToReadableRecord()
|
||||
}
|
||||
|
@ -370,8 +370,8 @@ $ %s tx %s delete-name [crn]
|
||||
}
|
||||
|
||||
// GetPayloadFromFile Load payload object from YAML file.
|
||||
func GetPayloadFromFile(filePath string) (*types.PayloadEncodable, error) {
|
||||
var payload types.PayloadEncodable
|
||||
func GetPayloadFromFile(filePath string) (*types.ReadablePayload, error) {
|
||||
var payload types.ReadablePayload
|
||||
|
||||
data, err := os.ReadFile(filePath) // #nosec G304
|
||||
if err != nil {
|
||||
|
@ -433,7 +433,7 @@ func (s *IntegrationTestSuite) TestGRPCQueryGetRecordByID() {
|
||||
}
|
||||
out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
|
||||
sr.NoError(err)
|
||||
var records []nstypes.RecordEncodable
|
||||
var records []nstypes.ReadableRecord
|
||||
err = json.Unmarshal(out.Bytes(), &records)
|
||||
sr.NoError(err)
|
||||
return records[0].ID
|
||||
|
@ -114,7 +114,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryForRecords() {
|
||||
sr.Error(err)
|
||||
} else {
|
||||
sr.NoError(err)
|
||||
var records []types.RecordEncodable
|
||||
var records []types.ReadableRecord
|
||||
err := json.Unmarshal(out.Bytes(), &records)
|
||||
sr.NoError(err)
|
||||
sr.Equal(tc.noOfRecords, len(records))
|
||||
|
@ -606,7 +606,7 @@ func (s *IntegrationTestSuite) TestGetCmdDissociateBond() {
|
||||
cmd = cli.GetCmdList()
|
||||
out, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
|
||||
sr.NoError(err)
|
||||
var records []nstypes.RecordEncodable
|
||||
var records []nstypes.ReadableRecord
|
||||
err = json.Unmarshal(out.Bytes(), &records)
|
||||
sr.NoError(err)
|
||||
return records[0].ID
|
||||
@ -848,7 +848,7 @@ func (s *IntegrationTestSuite) TestGetCmdAssociateBond() {
|
||||
cmd = cli.GetCmdList()
|
||||
out, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
|
||||
sr.NoError(err)
|
||||
var records []nstypes.RecordEncodable
|
||||
var records []nstypes.ReadableRecord
|
||||
err = json.Unmarshal(out.Bytes(), &records)
|
||||
sr.NoError(err)
|
||||
|
||||
|
@ -267,9 +267,9 @@ func (k Keeper) GetRecordExpiryQueue(ctx sdk.Context) []*types.ExpiryQueueRecord
|
||||
}
|
||||
|
||||
// ProcessSetRecord creates a record.
|
||||
func (k Keeper) ProcessSetRecord(ctx sdk.Context, msg types.MsgSetRecord) (*types.RecordEncodable, error) {
|
||||
func (k Keeper) ProcessSetRecord(ctx sdk.Context, msg types.MsgSetRecord) (*types.ReadableRecord, error) {
|
||||
payload := msg.Payload.ToReadablePayload()
|
||||
record := types.RecordEncodable{Attributes: payload.RecordAttributes, BondID: msg.BondId}
|
||||
record := types.ReadableRecord{Attributes: payload.RecordAttributes, BondID: msg.BondId}
|
||||
|
||||
// Check signatures.
|
||||
resourceSignBytes, _ := record.GetSignBytes()
|
||||
@ -308,7 +308,7 @@ func (k Keeper) ProcessSetRecord(ctx sdk.Context, msg types.MsgSetRecord) (*type
|
||||
return &record, nil
|
||||
}
|
||||
|
||||
func (k Keeper) processRecord(ctx sdk.Context, record *types.RecordEncodable, isRenewal bool) error {
|
||||
func (k Keeper) processRecord(ctx sdk.Context, record *types.ReadableRecord, isRenewal bool) error {
|
||||
params := k.GetParams(ctx)
|
||||
rent := params.RecordRent
|
||||
|
||||
|
@ -19,14 +19,14 @@ const (
|
||||
|
||||
type AttributeMap map[string]interface{}
|
||||
|
||||
// PayloadEncodable represents a signed record payload that can be serialized from/to YAML.
|
||||
type PayloadEncodable struct {
|
||||
// ReadablePayload represents a signed record payload that can be serialized from/to YAML.
|
||||
type ReadablePayload struct {
|
||||
RecordAttributes AttributeMap `json:"record" yaml:"record"`
|
||||
Signatures []Signature `json:"signatures" yaml:"signatures"`
|
||||
}
|
||||
|
||||
// RecordEncodable represents a WNS record.
|
||||
type RecordEncodable struct {
|
||||
// ReadableRecord represents a WNS record.
|
||||
type ReadableRecord struct {
|
||||
ID string `json:"id,omitempty"`
|
||||
Names []string `json:"names,omitempty"`
|
||||
BondID string `json:"bondId,omitempty"`
|
||||
@ -39,7 +39,7 @@ type RecordEncodable struct {
|
||||
|
||||
// ToPayload converts PayloadEncodable to Payload object.
|
||||
// Why? Because go-amino can't handle maps: https://github.com/tendermint/go-amino/issues/4.
|
||||
func (payloadObj *PayloadEncodable) ToPayload() Payload {
|
||||
func (payloadObj *ReadablePayload) ToPayload() Payload {
|
||||
// Note: record directly contains the attributes here
|
||||
attributes := payloadObj.RecordAttributes
|
||||
payload := Payload{
|
||||
@ -54,8 +54,8 @@ func (payloadObj *PayloadEncodable) ToPayload() Payload {
|
||||
}
|
||||
|
||||
// ToReadablePayload converts Payload to a serializable object
|
||||
func (payload Payload) ToReadablePayload() PayloadEncodable {
|
||||
var encodable PayloadEncodable
|
||||
func (payload Payload) ToReadablePayload() ReadablePayload {
|
||||
var encodable ReadablePayload
|
||||
|
||||
encodable.RecordAttributes = helpers.MustUnmarshalJSON[AttributeMap](payload.Record.Attributes)
|
||||
encodable.Signatures = payload.Signatures
|
||||
@ -65,7 +65,7 @@ func (payload Payload) ToReadablePayload() PayloadEncodable {
|
||||
|
||||
// ToRecordObj converts Record to RecordObj.
|
||||
// Why? Because go-amino can't handle maps: https://github.com/tendermint/go-amino/issues/4.
|
||||
func (r *RecordEncodable) ToRecordObj() (Record, error) {
|
||||
func (r *ReadableRecord) ToRecordObj() (Record, error) {
|
||||
var resourceObj Record
|
||||
|
||||
resourceObj.Id = r.ID
|
||||
@ -80,8 +80,8 @@ func (r *RecordEncodable) ToRecordObj() (Record, error) {
|
||||
}
|
||||
|
||||
// ToReadableRecord converts Record to a serializable object
|
||||
func (r *Record) ToReadableRecord() RecordEncodable {
|
||||
var resourceObj RecordEncodable
|
||||
func (r *Record) ToReadableRecord() ReadableRecord {
|
||||
var resourceObj ReadableRecord
|
||||
|
||||
resourceObj.ID = r.Id
|
||||
resourceObj.BondID = r.BondId
|
||||
@ -96,7 +96,7 @@ func (r *Record) ToReadableRecord() RecordEncodable {
|
||||
}
|
||||
|
||||
// CanonicalJSON returns the canonical JSON representation of the record.
|
||||
func (r *RecordEncodable) CanonicalJSON() []byte {
|
||||
func (r *ReadableRecord) CanonicalJSON() []byte {
|
||||
bytes, err := canonicaljson.Marshal(r.Attributes)
|
||||
if err != nil {
|
||||
panic("error marshalling record: " + err.Error())
|
||||
@ -106,7 +106,7 @@ func (r *RecordEncodable) CanonicalJSON() []byte {
|
||||
}
|
||||
|
||||
// GetSignBytes generates a record hash to be signed.
|
||||
func (r *RecordEncodable) GetSignBytes() ([]byte, []byte) {
|
||||
func (r *ReadableRecord) GetSignBytes() ([]byte, []byte) {
|
||||
// Double SHA256 hash.
|
||||
|
||||
// Input to the first round of hashing.
|
||||
@ -126,7 +126,7 @@ func (r *RecordEncodable) GetSignBytes() ([]byte, []byte) {
|
||||
}
|
||||
|
||||
// GetCID gets the record CID.
|
||||
func (r *RecordEncodable) GetCID() (string, error) {
|
||||
func (r *ReadableRecord) GetCID() (string, error) {
|
||||
id, err := helpers.GetCid(r.CanonicalJSON())
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
Loading…
Reference in New Issue
Block a user