From 3e6c16afd381a9305ffb077820b8fb41b907e0ff Mon Sep 17 00:00:00 2001
From: Marius van der Wijden <m.vanderwijden@live.de>
Date: Fri, 18 Aug 2023 22:41:19 +0200
Subject: [PATCH] trie: reduce allocs in recHash (#27770)

# Conflicts:
#	trie/stacktrie.go
---
 trie/encoding.go      |  7 +++----
 trie/encoding_test.go | 13 +++++++++----
 trie/stacktrie.go     |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/trie/encoding.go b/trie/encoding.go
index 8ee0022ef..3284d3f8f 100644
--- a/trie/encoding.go
+++ b/trie/encoding.go
@@ -51,9 +51,8 @@ func hexToCompact(hex []byte) []byte {
 	return buf
 }
 
-// hexToCompactInPlace places the compact key in input buffer, returning the length
-// needed for the representation
-func hexToCompactInPlace(hex []byte) int {
+// hexToCompactInPlace places the compact key in input buffer, returning the compacted key.
+func hexToCompactInPlace(hex []byte) []byte {
 	var (
 		hexLen    = len(hex) // length of the hex input
 		firstByte = byte(0)
@@ -77,7 +76,7 @@ func hexToCompactInPlace(hex []byte) int {
 		hex[bi] = hex[ni]<<4 | hex[ni+1]
 	}
 	hex[0] = firstByte
-	return binLen
+	return hex[:binLen]
 }
 
 func compactToHex(compact []byte) []byte {
diff --git a/trie/encoding_test.go b/trie/encoding_test.go
index d16d25c35..ac50b5d02 100644
--- a/trie/encoding_test.go
+++ b/trie/encoding_test.go
@@ -86,8 +86,7 @@ func TestHexToCompactInPlace(t *testing.T) {
 	} {
 		hexBytes, _ := hex.DecodeString(key)
 		exp := hexToCompact(hexBytes)
-		sz := hexToCompactInPlace(hexBytes)
-		got := hexBytes[:sz]
+		got := hexToCompactInPlace(hexBytes)
 		if !bytes.Equal(exp, got) {
 			t.Fatalf("test %d: encoding err\ninp %v\ngot %x\nexp %x\n", i, key, got, exp)
 		}
@@ -102,8 +101,7 @@ func TestHexToCompactInPlaceRandom(t *testing.T) {
 		hexBytes := keybytesToHex(key)
 		hexOrig := []byte(string(hexBytes))
 		exp := hexToCompact(hexBytes)
-		sz := hexToCompactInPlace(hexBytes)
-		got := hexBytes[:sz]
+		got := hexToCompactInPlace(hexBytes)
 
 		if !bytes.Equal(exp, got) {
 			t.Fatalf("encoding err \ncpt %x\nhex %x\ngot %x\nexp %x\n",
@@ -119,6 +117,13 @@ func BenchmarkHexToCompact(b *testing.B) {
 	}
 }
 
+func BenchmarkHexToCompactInPlace(b *testing.B) {
+	testBytes := []byte{0, 15, 1, 12, 11, 8, 16 /*term*/}
+	for i := 0; i < b.N; i++ {
+		hexToCompactInPlace(testBytes)
+	}
+}
+
 func BenchmarkCompactToHex(b *testing.B) {
 	testBytes := []byte{0, 15, 1, 12, 11, 8, 16 /*term*/}
 	for i := 0; i < b.N; i++ {
diff --git a/trie/stacktrie.go b/trie/stacktrie.go
index 89066beba..09c340266 100644
--- a/trie/stacktrie.go
+++ b/trie/stacktrie.go
@@ -357,7 +357,7 @@ func (t *StackTrie) hash(st *stNode, path []byte) {
 
 	case leafNode:
 		st.key = append(st.key, byte(16))
-		n := shortNode{Key: hexToCompact(st.key), Val: valueNode(st.val)}
+		n := shortNode{Key: hexToCompactInPlace(st.key), Val: valueNode(st.val)}
 
 		n.encode(t.h.encbuf)
 		blob = t.h.encodedBytes()