Skip to content

Add hexInt marshal function and tests #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alinurammar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add hexInt marshal function and tests #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cca21c
Add hexInt marshal function and tests
alinurammar Dec 6, 2022
90e4041
actually tested
alinurammar Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package ethrpc
import (
"bytes"
"encoding/json"
"fmt"
"math/big"
"strconv"
"unsafe"
)

Expand Down Expand Up @@ -232,6 +234,13 @@ func (i *hexInt) UnmarshalJSON(data []byte) error {
return err
}

func (i *hexInt) MarshalJSON() ([]byte, error) {
// Convert the hexInt value to a base 16 string
str := strconv.FormatInt(int64(*i), 16)

return []byte(fmt.Sprintf(`"0x%s"`, str)), nil
}

type hexBig big.Int

func (i *hexBig) UnmarshalJSON(data []byte) error {
Expand Down
14 changes: 14 additions & 0 deletions types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ func TestHexIntUnmarshal(t *testing.T) {
require.Equal(t, hexInt(1885000), test.ID)
}

func TestHexIntMarshal(t *testing.T) {
test := struct {
ID hexInt `json:"id"`
}{
ID: hexInt(1885000),
}

data, err := json.Marshal(&test)
require.Nil(t, err)

expected := []byte(`{"id":"0x1cc348"}`)
require.Equal(t, expected, data)
}

func TestHexBigUnmarshal(t *testing.T) {
test := struct {
ID hexBig `json:"id"`
Expand Down