chore(eth): minor optimisation in EthHashFromCid

filecoin-project · Sep 13, 2024 · cadc89d · cadc89d
1 parent 6c63df6
commit cadc89d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/chain/types/ethtypes/eth_types.go b/chain/types/ethtypes/eth_types.go
@@ -529,7 +529,13 @@ func handleHexStringPrefix(s string) string {
 }
 
 func EthHashFromCid(c cid.Cid) (EthHash, error) {
-	return ParseEthHash(c.Hash().HexString()[8:])
+	b := c.Hash()
+	if len(b) != EthHashLength+4 {
+		return EthHash{}, fmt.Errorf("CID hash length is not 32 bytes")
+	}
+	var h EthHash
+	copy(h[:], b[4:])
+	return h, nil
 }
 
 func ParseEthHash(s string) (EthHash, error) {

diff --git a/chain/types/ethtypes/eth_types_test.go b/chain/types/ethtypes/eth_types_test.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ipfs/go-cid"
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/go-address"
@@ -105,6 +106,15 @@ func TestEthHash(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, hash, string(jm))
 	}
+
+	_, err := EthHashFromCid(cid.Undef)
+	require.ErrorContains(t, err, "not 32 bytes")
+
+	_, err = EthHashFromCid(cid.MustParse("bafkqaaa"))
+	require.ErrorContains(t, err, "not 32 bytes")
+
+	_, err = EthHashFromCid(cid.MustParse("bafyrgqhai26anf3i7pips7q22coa4sz2fr4gk4q4sqdtymvvjyginfzaqewveaeqdh524nsktaq43j65v22xxrybrtertmcfxufdam3da3hbk"))
+	require.ErrorContains(t, err, "not 32 bytes")
 }
 
 func TestEthFilterID(t *testing.T) {
@@ -525,3 +535,14 @@ func TestFilecoinAddressToEthAddressParams(t *testing.T) {
 func stringPtr(s string) *string {
 	return &s
 }
+
+func BenchmarkEthHashFromCid(b *testing.B) {
+	c := cid.MustParse("bafy2bzacedwviarjtjraqakob5pslltmuo5n3xev3nt5zylezofkbbv5jclyu")
+
+	for i := 0; i < b.N; i++ {
+		_, err := EthHashFromCid(c)
+		if err != nil {
+			b.Fatalf("Error in EthHashFromCid: %v", err)
+		}
+	}
+}