cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

check non-existent block hash

Browse Source
This commit is contained in:
ychiao 2023-01-02 17:21:47 +08:00
parent f8e215c817
commit 7029364f4d
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/docgen/docgen.go
View File

@ -387,10 +387,10 @@ func init() {
addExample(&uuid.UUID{}) addExample(&uuid.UUID{})
filterid, _ := ethtypes.EthHashFromHex("0x5CbEeC012345673f25E309Cc264f240bb0664031") filterid, _ := ethtypes.NewEthHashFromHex("0x5CbEeC012345673f25E309Cc264f240bb0664031")
addExample(ethtypes.EthFilterID(filterid)) addExample(ethtypes.EthFilterID(filterid))
subid, _ := ethtypes.EthHashFromHex("0x5CbEeCF99d3fDB301234567c264f240bb0664031") subid, _ := ethtypes.NewEthHashFromHex("0x5CbEeCF99d3fDB301234567c264f240bb0664031")
addExample(ethtypes.EthSubscriptionID(subid)) addExample(ethtypes.EthSubscriptionID(subid))
pstring := func(s string) *string { return &s } pstring := func(s string) *string { return &s }

6
chain/types/ethtypes/eth_types.go
View File

@ -342,7 +342,7 @@ func (h *EthHash) UnmarshalJSON(b []byte) error {
if err := json.Unmarshal(b, &s); err != nil { if err := json.Unmarshal(b, &s); err != nil {
return err return err
} }
hash, err := EthHashFromHex(s) hash, err := NewEthHashFromHex(s)
if err != nil { if err != nil {
return err return err
} }
@ -373,10 +373,10 @@ func decodeHexString(s string, length int) ([]byte, error) {
} }
func NewEthHashFromCid(c cid.Cid) (EthHash, error) { func NewEthHashFromCid(c cid.Cid) (EthHash, error) {
return EthHashFromHex(c.Hash().HexString()[8:]) return NewEthHashFromHex(c.Hash().HexString()[8:])
} }
func EthHashFromHex(s string) (EthHash, error) { func NewEthHashFromHex(s string) (EthHash, error) {
handlePrefix(&s) handlePrefix(&s)
b, err := decodeHexString(s, EthHashLength) b, err := decodeHexString(s, EthHashLength)
if err != nil { if err != nil {

12
chain/types/ethtypes/eth_types_test.go
View File

@ -158,10 +158,10 @@ func TestUnmarshalEthBytes(t *testing.T) {
} }
func TestEthFilterResultMarshalJSON(t *testing.T) { func TestEthFilterResultMarshalJSON(t *testing.T) {
hash1, err := EthHashFromHex("013dbb9442ca9667baccc6230fcd5c1c4b2d4d2870f4bd20681d4d47cfd15184") hash1, err := NewEthHashFromHex("013dbb9442ca9667baccc6230fcd5c1c4b2d4d2870f4bd20681d4d47cfd15184")
require.NoError(t, err, "eth hash") require.NoError(t, err, "eth hash")
hash2, err := EthHashFromHex("ab8653edf9f51785664a643b47605a7ba3d917b5339a0724e7642c114d0e4738") hash2, err := NewEthHashFromHex("ab8653edf9f51785664a643b47605a7ba3d917b5339a0724e7642c114d0e4738")
require.NoError(t, err, "eth hash") require.NoError(t, err, "eth hash")
addr, err := EthAddressFromHex("d4c5fb16488Aa48081296299d54b0c648C9333dA") addr, err := EthAddressFromHex("d4c5fb16488Aa48081296299d54b0c648C9333dA")
@ -223,10 +223,10 @@ func TestEthFilterResultMarshalJSON(t *testing.T) {
} }
func TestEthFilterSpecUnmarshalJSON(t *testing.T) { func TestEthFilterSpecUnmarshalJSON(t *testing.T) {
hash1, err := EthHashFromHex("013dbb9442ca9667baccc6230fcd5c1c4b2d4d2870f4bd20681d4d47cfd15184") hash1, err := NewEthHashFromHex("013dbb9442ca9667baccc6230fcd5c1c4b2d4d2870f4bd20681d4d47cfd15184")
require.NoError(t, err, "eth hash") require.NoError(t, err, "eth hash")
hash2, err := EthHashFromHex("ab8653edf9f51785664a643b47605a7ba3d917b5339a0724e7642c114d0e4738") hash2, err := NewEthHashFromHex("ab8653edf9f51785664a643b47605a7ba3d917b5339a0724e7642c114d0e4738")
require.NoError(t, err, "eth hash") require.NoError(t, err, "eth hash")
addr, err := EthAddressFromHex("d4c5fb16488Aa48081296299d54b0c648C9333dA") addr, err := EthAddressFromHex("d4c5fb16488Aa48081296299d54b0c648C9333dA")
@ -348,10 +348,10 @@ func TestEthAddressListUnmarshalJSON(t *testing.T) {
} }
func TestEthHashListUnmarshalJSON(t *testing.T) { func TestEthHashListUnmarshalJSON(t *testing.T) {
hash1, err := EthHashFromHex("013dbb9442ca9667baccc6230fcd5c1c4b2d4d2870f4bd20681d4d47cfd15184") hash1, err := NewEthHashFromHex("013dbb9442ca9667baccc6230fcd5c1c4b2d4d2870f4bd20681d4d47cfd15184")
require.NoError(t, err, "eth hash") require.NoError(t, err, "eth hash")
hash2, err := EthHashFromHex("ab8653edf9f51785664a643b47605a7ba3d917b5339a0724e7642c114d0e4738") hash2, err := NewEthHashFromHex("ab8653edf9f51785664a643b47605a7ba3d917b5339a0724e7642c114d0e4738")
require.NoError(t, err, "eth hash") require.NoError(t, err, "eth hash")
testcases := []struct { testcases := []struct {

6
itests/eth_deploy_test.go
View File

@ -148,6 +148,12 @@ func TestDeployment(t *testing.T) {
require.NotNil(t, chainTx.TransactionIndex) require.NotNil(t, chainTx.TransactionIndex)
require.Equal(t, uint64(*chainTx.TransactionIndex), uint64(0)) // only transaction require.Equal(t, uint64(*chainTx.TransactionIndex), uint64(0)) // only transaction
// should return error with non-existent block hash
nonExistentHash, err := ethtypes.NewEthHashFromHex("0x62a80aa9262a3e1d3db0706af41c8535257b6275a283174cabf9d108d8946059")
require.Nil(t, err)
_, err = client.EthGetBlockByHash(ctx, nonExistentHash, false)
require.NotNil(t, err)
// verify block information // verify block information
block1, err := client.EthGetBlockByHash(ctx, *chainTx.BlockHash, false) block1, err := client.EthGetBlockByHash(ctx, *chainTx.BlockHash, false)
require.Nil(t, err) require.Nil(t, err)

2
itests/eth_filter_test.go
View File

@ -345,7 +345,7 @@ func ParseEthLog(in map[string]interface{}) (*ethtypes.EthLog, error) {
if !ok { if !ok {
return ethtypes.EthHash{}, xerrors.Errorf(k + " not a string") return ethtypes.EthHash{}, xerrors.Errorf(k + " not a string")
} }
return ethtypes.EthHashFromHex(s) return ethtypes.NewEthHashFromHex(s)
} }
ethUint64 := func(k string, v interface{}) (ethtypes.EthUint64, error) { ethUint64 := func(k string, v interface{}) (ethtypes.EthUint64, error) {