fixed empty result for...

- `eth_getBlockByNumber` - `eth_getBlockByHash` - `eth_getTransactionByHash` - `eth_getReceiptByHash`
lmittmann · Feb 5, 2022 · ae8221e · ae8221e
1 parent bd6cb5d
commit ae8221e
Show file tree

Hide file tree

Showing 13 changed files with 108 additions and 0 deletions.
diff --git a/module/eth/common.go b/module/eth/common.go
@@ -10,6 +10,10 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 )
 
+var (
+	errNotFound = fmt.Errorf("not found")
+)
+
 func toBlockNumberArg(blockNumber *big.Int) string {
 	if blockNumber == nil {
 		return "latest"

diff --git a/module/eth/get_block_by_hash.go b/module/eth/get_block_by_hash.go
@@ -40,6 +40,9 @@ func (f *BlockByHashFactory) HandleResponse(elem rpc.BatchElem) error {
 	if err := elem.Error; err != nil {
 		return err
 	}
+	if len(f.result) <= 4 { // empty or "null"
+		return errNotFound
+	}
 
 	var head *types.Header
 	var body rpcBlock

diff --git a/module/eth/get_block_by_hash_test.go b/module/eth/get_block_by_hash_test.go
@@ -1,10 +1,12 @@
 package eth_test
 
 import (
+	"fmt"
 	"math/big"
 	"sync/atomic"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -146,3 +148,22 @@ func TestHeaderByHash__12965000(t *testing.T) {
 		t.Fatalf("(-want, +got)\n%s", diff)
 	}
 }
+
+func TestBlockByHash__0x00(t *testing.T) {
+	t.Parallel()
+
+	srv := rpctest.NewFileServer(t, "testdata/get_block_by_hash__0x00.golden")
+	defer srv.Close()
+
+	client := w3.MustDial(srv.URL())
+	defer client.Close()
+
+	var (
+		block   = new(types.Block)
+		wantErr = fmt.Errorf("w3: response handling failed: not found")
+	)
+
+	if gotErr := client.Call(eth.BlockByHash(common.Hash{}).Returns(block)); wantErr.Error() != gotErr.Error() {
+		t.Fatalf("want %v, got %v", wantErr, gotErr)
+	}
+}
diff --git a/module/eth/get_block_by_number.go b/module/eth/get_block_by_number.go
@@ -40,6 +40,9 @@ func (f *BlockByNumberFactory) HandleResponse(elem rpc.BatchElem) error {
 	if err := elem.Error; err != nil {
 		return err
 	}
+	if len(f.result) <= 4 { // empty or "null"
+		return errNotFound
+	}
 
 	var head *types.Header
 	var body rpcBlock

diff --git a/module/eth/get_block_by_number_test.go b/module/eth/get_block_by_number_test.go
@@ -1,6 +1,7 @@
 package eth_test
 
 import (
+	"fmt"
 	"math/big"
 	"sync/atomic"
 	"testing"
@@ -146,3 +147,22 @@ func TestHeaderByNumber__12965000(t *testing.T) {
 		t.Fatalf("(-want, +got)\n%s", diff)
 	}
 }
+
+func TestBlockByNumber__999999999(t *testing.T) {
+	t.Parallel()
+
+	srv := rpctest.NewFileServer(t, "testdata/get_block_by_number__999999999.golden")
+	defer srv.Close()
+
+	client := w3.MustDial(srv.URL())
+	defer client.Close()
+
+	var (
+		block   = new(types.Block)
+		wantErr = fmt.Errorf("w3: response handling failed: not found")
+	)
+
+	if gotErr := client.Call(eth.BlockByNumber(big.NewInt(999999999)).Returns(block)); wantErr.Error() != gotErr.Error() {
+		t.Fatalf("want %v, got %v", wantErr, gotErr)
+	}
+}
diff --git a/module/eth/get_transaction_by_hash.go b/module/eth/get_transaction_by_hash.go
@@ -38,6 +38,10 @@ func (f *TransactionByHashFactory) HandleResponse(elem rpc.BatchElem) error {
 	if err := elem.Error; err != nil {
 		return err
 	}
+	if f.result == nil {
+		return errNotFound
+	}
+
 	*f.returns = *f.result
 	return nil
 }
diff --git a/module/eth/get_transaction_by_hash_test.go b/module/eth/get_transaction_by_hash_test.go
@@ -1,10 +1,12 @@
 package eth_test
 
 import (
+	"fmt"
 	"math/big"
 	"sync/atomic"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -81,3 +83,22 @@ func TestTransactionByHash_Type2(t *testing.T) {
 		t.Fatalf("(-want, +got)\n%s", diff)
 	}
 }
+
+func TestTransactionByHash_0x00(t *testing.T) {
+	t.Parallel()
+
+	srv := rpctest.NewFileServer(t, "testdata/get_transaction_by_hash__0x00.golden")
+	defer srv.Close()
+
+	client := w3.MustDial(srv.URL())
+	defer client.Close()
+
+	var (
+		tx      = new(types.Transaction)
+		wantErr = fmt.Errorf("w3: response handling failed: not found")
+	)
+
+	if gotErr := client.Call(eth.TransactionByHash(common.Hash{}).Returns(tx)); wantErr.Error() != gotErr.Error() {
+		t.Fatalf("want %v, got %v", wantErr, gotErr)
+	}
+}
diff --git a/module/eth/get_transaction_receipt.go b/module/eth/get_transaction_receipt.go
@@ -38,6 +38,10 @@ func (f *TransactionReceiptFactory) HandleResponse(elem rpc.BatchElem) error {
 	if err := elem.Error; err != nil {
 		return err
 	}
+	if f.result == nil {
+		return errNotFound
+	}
+
 	*f.returns = *f.result
 	return nil
 }
diff --git a/module/eth/get_transaction_receipt_test.go b/module/eth/get_transaction_receipt_test.go
@@ -1,6 +1,7 @@
 package eth_test
 
 import (
+	"fmt"
 	"math/big"
 	"sync/atomic"
 	"testing"
@@ -65,3 +66,22 @@ func TestTransactionReceipt(t *testing.T) {
 		t.Fatalf("(-want, +got)\n%s", diff)
 	}
 }
+
+func TestTransactionReceipt_0x00(t *testing.T) {
+	t.Parallel()
+
+	srv := rpctest.NewFileServer(t, "testdata/get_transaction_receipt_0x00.golden")
+	defer srv.Close()
+
+	client := w3.MustDial(srv.URL())
+	defer client.Close()
+
+	var (
+		receipt = new(types.Receipt)
+		wantErr = fmt.Errorf("w3: response handling failed: not found")
+	)
+
+	if gotErr := client.Call(eth.TransactionReceipt(common.Hash{}).Returns(receipt)); wantErr.Error() != gotErr.Error() {
+		t.Fatalf("want %v, got %v", wantErr, gotErr)
+	}
+}
diff --git a/module/eth/testdata/get_block_by_hash__0x00.golden b/module/eth/testdata/get_block_by_hash__0x00.golden
@@ -0,0 +1,2 @@
+> [{"jsonrpc":"2.0","id":1,"method":"eth_getBlockByHash","params":["0x0000000000000000000000000000000000000000000000000000000000000000",true]}]
+< [{"jsonrpc":"2.0","id":1,"result":null}]
diff --git a/module/eth/testdata/get_block_by_number__999999999.golden b/module/eth/testdata/get_block_by_number__999999999.golden
@@ -0,0 +1,2 @@
+> [{"jsonrpc":"2.0","id":1,"method":"eth_getBlockByNumber","params":["0x3b9ac9ff",true]}]
+< [{"jsonrpc":"2.0","id":1,"result":null}]
diff --git a/module/eth/testdata/get_transaction_by_hash__0x00.golden b/module/eth/testdata/get_transaction_by_hash__0x00.golden
@@ -0,0 +1,2 @@
+> [{"jsonrpc":"2.0","id":1,"method":"eth_getTransactionByHash","params":["0x0000000000000000000000000000000000000000000000000000000000000000"]}]
+< [{"jsonrpc":"2.0","id":1,"result":null}]
diff --git a/module/eth/testdata/get_transaction_receipt_0x00.golden b/module/eth/testdata/get_transaction_receipt_0x00.golden
@@ -0,0 +1,2 @@
+> [{"jsonrpc":"2.0","id":1,"method":"eth_getTransactionReceipt","params":["0x0000000000000000000000000000000000000000000000000000000000000000"]}]
+< [{"jsonrpc":"2.0","id":1,"result":null}]