Skip to content
This repository was archived by the owner on Nov 30, 2021. It is now read-only.

fix rpc hex unmarshaling #529

Merged
merged 2 commits into from
Sep 23, 2020
Merged

fix rpc hex unmarshaling #529

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6517aad
fix rpc hex unmarshaling
noot Sep 23, 2020
6354b25
Merge branch 'development' of github.com:ChainSafe/ethermint into noo…
noot Sep 23, 2020
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
19 changes: 9 additions & 10 deletions tests/rpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func TestEth_GetLogs_Topics_AB(t *testing.T) {
func TestEth_GetTransactionCount(t *testing.T) {
// TODO: this test passes on when run on its own, but fails when run with the other tests
if testing.Short() {
t.Skip("skipping TestEth_GetLogs_Topics_AB")
t.Skip("skipping TestEth_GetTransactionCount")
}

prev := getNonce(t)
Expand All @@ -238,7 +238,7 @@ func TestEth_GetTransactionCount(t *testing.T) {
func TestEth_GetTransactionLogs(t *testing.T) {
// TODO: this test passes on when run on its own, but fails when run with the other tests
if testing.Short() {
t.Skip("skipping TestEth_GetLogs_Topics_AB")
t.Skip("skipping TestEth_GetTransactionLogs")
}

hash, _ := deployTestContract(t)
Expand Down Expand Up @@ -569,15 +569,15 @@ func TestEth_GetFilterChanges_NoTopics(t *testing.T) {
// instantiate new filter
rpcRes = call(t, "eth_newFilter", param)
require.Nil(t, rpcRes.Error)
var ID hexutil.Bytes
var ID string
err = json.Unmarshal(rpcRes.Result, &ID)
require.NoError(t, err)

// deploy contract, emitting some event
deployTestContract(t)

// get filter changes
changesRes := call(t, "eth_getFilterChanges", []string{ID.String()})
changesRes := call(t, "eth_getFilterChanges", []string{ID})

var logs []*ethtypes.Log
err = json.Unmarshal(changesRes.Result, &logs)
Expand Down Expand Up @@ -688,14 +688,14 @@ func TestEth_GetFilterChanges_Topics_XB(t *testing.T) {

// instantiate new filter
rpcRes = call(t, "eth_newFilter", param)
var ID hexutil.Bytes
var ID string
err = json.Unmarshal(rpcRes.Result, &ID)
require.NoError(t, err)

deployTestContractWithFunction(t)

// get filter changes
changesRes := call(t, "eth_getFilterChanges", []string{ID.String()})
changesRes := call(t, "eth_getFilterChanges", []string{ID})

var logs []*ethtypes.Log
err = json.Unmarshal(changesRes.Result, &logs)
Expand All @@ -712,10 +712,9 @@ func TestEth_GetFilterChanges_Topics_XXC(t *testing.T) {
func TestEth_PendingTransactionFilter(t *testing.T) {
rpcRes := call(t, "eth_newPendingTransactionFilter", []string{})

var code hexutil.Bytes
err := code.UnmarshalJSON(rpcRes.Result)
var ID string
err := json.Unmarshal(rpcRes.Result, &ID)
require.NoError(t, err)
require.NotNil(t, code)

for i := 0; i < 5; i++ {
deployTestContractWithFunction(t)
Expand All @@ -724,7 +723,7 @@ func TestEth_PendingTransactionFilter(t *testing.T) {
time.Sleep(10 * time.Second)

// get filter changes
changesRes := call(t, "eth_getFilterChanges", []string{code.String()})
changesRes := call(t, "eth_getFilterChanges", []string{ID})
require.NotNil(t, changesRes)

var txs []*hexutil.Bytes
Expand Down