interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make new types Stringers

This commit is contained in:
Taylor Gerring 2015-03-31 19:02:46 +02:00
parent 8f0e095f4c
commit a2501ecfcd
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rpc/messages.go
View File

@ -29,9 +29,12 @@ type hexdata struct {
data []byte data []byte
} }
func (d *hexdata) String() string {
return "0x" + common.Bytes2Hex(d.data)
}
func (d *hexdata) MarshalJSON() ([]byte, error) { func (d *hexdata) MarshalJSON() ([]byte, error) {
v := common.Bytes2Hex(d.data) return json.Marshal(d.String())
return json.Marshal("0x" + v)
} }
func (d *hexdata) UnmarshalJSON(b []byte) (err error) { func (d *hexdata) UnmarshalJSON(b []byte) (err error) {
@ -72,7 +75,7 @@ type hexnum struct {
data []byte data []byte
} }
func (d *hexnum) MarshalJSON() ([]byte, error) { func (d *hexnum) String() string {
// Get hex string from bytes // Get hex string from bytes
out := common.Bytes2Hex(d.data) out := common.Bytes2Hex(d.data)
// Trim leading 0s // Trim leading 0s
@ -81,7 +84,11 @@ func (d *hexnum) MarshalJSON() ([]byte, error) {
if len(out) == 0 { if len(out) == 0 {
out = "0" out = "0"
} }
return json.Marshal("0x" + out) return "0x" + out
}
func (d *hexnum) MarshalJSON() ([]byte, error) {
return json.Marshal(d.String())
} }
func (d *hexnum) UnmarshalJSON(b []byte) (err error) { func (d *hexnum) UnmarshalJSON(b []byte) (err error) {