github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-10 07:58:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix payloadStatusJSON fields (#10246)

Browse Source 
* Use pointers

* Use pointers

* Use pointers

* Update json_marshal_unmarshal.go

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
terence tsao
2022-02-15 15:26:58 -08:00
committed by GitHub
parent 6dcf47675b
commit 6311cfd8ab
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
proto/engine/v1/json_marshal_unmarshal.go
View File

@@ -270,17 +270,18 @@ func (p *PayloadAttributes) UnmarshalJSON(enc []byte) error {
}
type payloadStatusJSON struct {
LatestValidHash hexutil.Bytes `json:"latestValidHash"`
Status string `json:"status"`
ValidationError string `json:"validationError"`
LatestValidHash *hexutil.Bytes `json:"latestValidHash"`
Status string `json:"status"`
ValidationError *string `json:"validationError"`
}
// MarshalJSON --
func (p *PayloadStatus) MarshalJSON() ([]byte, error) {
hash := p.LatestValidHash
return json.Marshal(payloadStatusJSON{
LatestValidHash: p.LatestValidHash,
LatestValidHash: (*hexutil.Bytes)(&hash),
Status: p.Status.String(),
ValidationError: p.ValidationError,
ValidationError: &p.ValidationError,
})
}
@@ -291,9 +292,9 @@ func (p *PayloadStatus) UnmarshalJSON(enc []byte) error {
return err
}
*p = PayloadStatus{}
p.LatestValidHash = dec.LatestValidHash
p.LatestValidHash = *dec.LatestValidHash
p.Status = PayloadStatus_Status(PayloadStatus_Status_value[dec.Status])
p.ValidationError = dec.ValidationError
p.ValidationError = *dec.ValidationError
return nil
}