diff options
| author | Felix Lange <fjl@users.noreply.github.com> | 2018-01-08 21:13:22 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-01-08 21:13:22 +0800 |
| commit | 9d06026c1991fdd8f034ce194fa20a0740c21810 (patch) | |
| tree | 8625b7c087dfcd8cf8f087113c7242cf0d7639cd /whisper/whisperv6/gen_criteria_json.go | |
| parent | 5c2f1e00148f16655d3fb63b93920b1108165c56 (diff) | |
| download | go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.gz go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.bz2 go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.lz go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.xz go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.tar.zst go-tangerine-9d06026c1991fdd8f034ce194fa20a0740c21810.zip | |
all: regenerate codecs with gencodec commit 90983d99de (#15830)
Fixes #15777 because null is now allowed for hexutil.Bytes.
Diffstat (limited to 'whisper/whisperv6/gen_criteria_json.go')
| -rw-r--r-- | whisper/whisperv6/gen_criteria_json.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 52a4d3cb6..a298396cc 100644 --- a/whisper/whisperv6/gen_criteria_json.go +++ b/whisper/whisperv6/gen_criteria_json.go @@ -31,12 +31,12 @@ func (c Criteria) MarshalJSON() ([]byte, error) { func (c *Criteria) UnmarshalJSON(input []byte) error { type Criteria struct { - SymKeyID *string `json:"symKeyID"` - PrivateKeyID *string `json:"privateKeyID"` - Sig hexutil.Bytes `json:"sig"` - MinPow *float64 `json:"minPow"` - Topics []TopicType `json:"topics"` - AllowP2P *bool `json:"allowP2P"` + SymKeyID *string `json:"symKeyID"` + PrivateKeyID *string `json:"privateKeyID"` + Sig *hexutil.Bytes `json:"sig"` + MinPow *float64 `json:"minPow"` + Topics []TopicType `json:"topics"` + AllowP2P *bool `json:"allowP2P"` } var dec Criteria if err := json.Unmarshal(input, &dec); err != nil { @@ -49,7 +49,7 @@ func (c *Criteria) UnmarshalJSON(input []byte) error { c.PrivateKeyID = *dec.PrivateKeyID } if dec.Sig != nil { - c.Sig = dec.Sig + c.Sig = *dec.Sig } if dec.MinPow != nil { c.MinPow = *dec.MinPow |