367c329b88
* whisper: fixes warnings from the code linter * whisper: more non-API-breaking changes The remaining lint errors are because of auto-generated files and one is because an exported function has a non- exported return type. Changing this would break the API, and will be part of another commit for easier reversal. * whisper: un-export NewSentMessage to please the linter This is an API change, which is why it's in its own commit. This change was initiated after the linter complained that the returned type wasn't exported. I chose to un-export the function instead of exporting the type, because that type is an implementation detail that I would like to change in the near future to make the code more readable and with an increased coverage. * whisper: update gencodec output after upgrading it to new lint standards
85 lines
2.0 KiB
Go
85 lines
2.0 KiB
Go
// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
|
|
|
|
package whisperv6
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
)
|
|
|
|
var _ = (*messageOverride)(nil)
|
|
|
|
// MarshalJSON marshals type Message to a json string
|
|
func (m Message) MarshalJSON() ([]byte, error) {
|
|
type Message struct {
|
|
Sig hexutil.Bytes `json:"sig,omitempty"`
|
|
TTL uint32 `json:"ttl"`
|
|
Timestamp uint32 `json:"timestamp"`
|
|
Topic TopicType `json:"topic"`
|
|
Payload hexutil.Bytes `json:"payload"`
|
|
Padding hexutil.Bytes `json:"padding"`
|
|
PoW float64 `json:"pow"`
|
|
Hash hexutil.Bytes `json:"hash"`
|
|
Dst hexutil.Bytes `json:"recipientPublicKey,omitempty"`
|
|
}
|
|
var enc Message
|
|
enc.Sig = m.Sig
|
|
enc.TTL = m.TTL
|
|
enc.Timestamp = m.Timestamp
|
|
enc.Topic = m.Topic
|
|
enc.Payload = m.Payload
|
|
enc.Padding = m.Padding
|
|
enc.PoW = m.PoW
|
|
enc.Hash = m.Hash
|
|
enc.Dst = m.Dst
|
|
return json.Marshal(&enc)
|
|
}
|
|
|
|
// UnmarshalJSON unmarshals type Message to a json string
|
|
func (m *Message) UnmarshalJSON(input []byte) error {
|
|
type Message struct {
|
|
Sig *hexutil.Bytes `json:"sig,omitempty"`
|
|
TTL *uint32 `json:"ttl"`
|
|
Timestamp *uint32 `json:"timestamp"`
|
|
Topic *TopicType `json:"topic"`
|
|
Payload *hexutil.Bytes `json:"payload"`
|
|
Padding *hexutil.Bytes `json:"padding"`
|
|
PoW *float64 `json:"pow"`
|
|
Hash *hexutil.Bytes `json:"hash"`
|
|
Dst *hexutil.Bytes `json:"recipientPublicKey,omitempty"`
|
|
}
|
|
var dec Message
|
|
if err := json.Unmarshal(input, &dec); err != nil {
|
|
return err
|
|
}
|
|
if dec.Sig != nil {
|
|
m.Sig = *dec.Sig
|
|
}
|
|
if dec.TTL != nil {
|
|
m.TTL = *dec.TTL
|
|
}
|
|
if dec.Timestamp != nil {
|
|
m.Timestamp = *dec.Timestamp
|
|
}
|
|
if dec.Topic != nil {
|
|
m.Topic = *dec.Topic
|
|
}
|
|
if dec.Payload != nil {
|
|
m.Payload = *dec.Payload
|
|
}
|
|
if dec.Padding != nil {
|
|
m.Padding = *dec.Padding
|
|
}
|
|
if dec.PoW != nil {
|
|
m.PoW = *dec.PoW
|
|
}
|
|
if dec.Hash != nil {
|
|
m.Hash = *dec.Hash
|
|
}
|
|
if dec.Dst != nil {
|
|
m.Dst = *dec.Dst
|
|
}
|
|
return nil
|
|
}
|