Skip to content

fix: Improve RPCRes JSON test suite #10096

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

Closed
mr-teikst wants to merge 1 commit into from
Closed

fix: Improve RPCRes JSON test suite #10096

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions proxyd/rpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"

"github.com/stretchr/testify/require"
"github.com/stretchr/testify/assert"
)

func TestRPCResJSON(t *testing.T) {
Expand All @@ -14,7 +14,7 @@ func TestRPCResJSON(t *testing.T) {
out string
}{
{
"string result",
"RPCRes with string result",
&RPCRes{
JSONRPC: JSONRPCVersion,
Result: "foobar",
Expand All @@ -23,7 +23,7 @@ func TestRPCResJSON(t *testing.T) {
`{"jsonrpc":"2.0","result":"foobar","id":123}`,
},
{
"object result",
"RPCRes with object result",
&RPCRes{
JSONRPC: JSONRPCVersion,
Result: struct {
Expand All @@ -36,7 +36,7 @@ func TestRPCResJSON(t *testing.T) {
`{"jsonrpc":"2.0","result":{"str":"test"},"id":123}`,
},
{
"nil result",
"RPCRes with nil result",
&RPCRes{
JSONRPC: JSONRPCVersion,
Result: nil,
Expand All @@ -45,7 +45,7 @@ func TestRPCResJSON(t *testing.T) {
`{"jsonrpc":"2.0","result":null,"id":123}`,
},
{
"error result without data",
"RPCRes with error result without data",
&RPCRes{
JSONRPC: JSONRPCVersion,
Error: &RPCErr{
Expand All @@ -57,7 +57,7 @@ func TestRPCResJSON(t *testing.T) {
`{"jsonrpc":"2.0","error":{"code":1234,"message":"test err"},"id":123}`,
},
{
"error result with data",
"RPCRes with error result with data",
&RPCRes{
JSONRPC: JSONRPCVersion,
Error: &RPCErr{
Expand All @@ -70,20 +70,21 @@ func TestRPCResJSON(t *testing.T) {
`{"jsonrpc":"2.0","error":{"code":1234,"message":"test err","data":"revert"},"id":123}`,
},
{
"string ID",
"RPCRes with string ID",
&RPCRes{
JSONRPC: JSONRPCVersion,
Result: "foobar",
ID: []byte("\"123\""),
ID: []byte(`"123"`),
},
`{"jsonrpc":"2.0","result":"foobar","id":"123"}`,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
out, err := json.Marshal(tt.in)
require.NoError(t, err)
require.Equal(t, tt.out, string(out))
assert.NoError(t, err)
assert.Equal(t, tt.out, string(out))
})
}
}