fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-24 10:11:48 +00:00
Code Issues Projects Releases Wiki Activity

Support json encode/decode for nil values in S structs

Browse Source
This commit is contained in:
Ethan Frey
2017-02-23 18:11:20 +01:00
parent b6a2c5949f
commit 8c9b889ccf
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
priv_key.go
View File

@ -47,7 +47,7 @@ func (p PrivKeyS) MarshalJSON() ([]byte, error) {
func (p *PrivKeyS) UnmarshalJSON(data []byte) (err error) {
parsed, err := privKeyMapper.FromJSON(data)
if err == nil {
if err == nil && parsed != nil {
p.PrivKey = parsed.(PrivKey)
}
return