gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

whisper: use hexutil.UnmarshalFixedText for topic parsing

Browse Source
This commit is contained in:
Bas van Kervel
2017-06-21 12:58:00 +02:00
parent a4e4c76cb3
commit c62d5422bb
3 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
whisper/whisperv5/topic.go
View File

@ -19,9 +19,6 @@
package whisperv5
import (
"encoding/json"
"fmt"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
)
@ -47,19 +44,12 @@ func (topic *TopicType) String() string {
return string(common.ToHex(topic[:]))
}
func (t *TopicType) MarshalJSON() ([]byte, error) {
return json.Marshal(hexutil.Bytes(t[:]))
// MarshalText returns the hex representation of t.
func (t TopicType) MarshalText() ([]byte, error) {
return hexutil.Bytes(t[:]).MarshalText()
}
// UnmarshalJSON parses a hex representation to a topic.
func (t *TopicType) UnmarshalJSON(input []byte) error {
var data hexutil.Bytes
if err := json.Unmarshal(input, &data); err != nil {
return err
}
if len(data) != TopicLength {
return fmt.Errorf("unmarshalJSON failed: topic must be exactly %d bytes(%d)", TopicLength, len(input))
}
*t = BytesToTopic(data)
return nil
// UnmarshalText parses a hex representation to a topic.
func (t *TopicType) UnmarshalText(input []byte) error {
return hexutil.UnmarshalFixedText("Topic", input, t[:])
}