From 4e7bc2bdc89e1fa27d259ef3efe7a59d2d2142d2 Mon Sep 17 00:00:00 2001
From: cui <cuiweixie@gmail.com>
Date: Thu, 7 Aug 2025 21:58:27 +0800
Subject: [PATCH] rlp: use reflect.TypeFor (#32317)

Co-authored-by: Felix Lange <fjl@twurst.com>
---
 rlp/decode.go | 8 ++++----
 rlp/encode.go | 2 +-
 rlp/raw.go    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rlp/decode.go b/rlp/decode.go
index 0fbca243ee..5a06f35ec0 100644
--- a/rlp/decode.go
+++ b/rlp/decode.go
@@ -148,9 +148,9 @@ func addErrorContext(err error, ctx string) error {
 }
 
 var (
-	decoderInterface = reflect.TypeOf(new(Decoder)).Elem()
-	bigInt           = reflect.TypeOf(big.Int{})
-	u256Int          = reflect.TypeOf(uint256.Int{})
+	decoderInterface = reflect.TypeFor[Decoder]()
+	bigInt           = reflect.TypeFor[big.Int]()
+	u256Int          = reflect.TypeFor[uint256.Int]()
 )
 
 func makeDecoder(typ reflect.Type, tags rlpstruct.Tags) (dec decoder, err error) {
@@ -512,7 +512,7 @@ func makeNilPtrDecoder(etype reflect.Type, etypeinfo *typeinfo, ts rlpstruct.Tag
 	}
 }
 
-var ifsliceType = reflect.TypeOf([]interface{}{})
+var ifsliceType = reflect.TypeFor[[]any]()
 
 func decodeInterface(s *Stream, val reflect.Value) error {
 	if val.Type().NumMethod() != 0 {
diff --git a/rlp/encode.go b/rlp/encode.go
index 3645bbfda0..623932a90b 100644
--- a/rlp/encode.go
+++ b/rlp/encode.go
@@ -133,7 +133,7 @@ func puthead(buf []byte, smalltag, largetag byte, size uint64) int {
 	return sizesize + 1
 }
 
-var encoderInterface = reflect.TypeOf(new(Encoder)).Elem()
+var encoderInterface = reflect.TypeFor[Encoder]()
 
 // makeWriter creates a writer function for the given type.
 func makeWriter(typ reflect.Type, ts rlpstruct.Tags) (writer, error) {
diff --git a/rlp/raw.go b/rlp/raw.go
index 879e3bfe5d..cec90346a1 100644
--- a/rlp/raw.go
+++ b/rlp/raw.go
@@ -26,7 +26,7 @@ import (
 // not verify whether the content of RawValues is valid RLP.
 type RawValue []byte
 
-var rawValueType = reflect.TypeOf(RawValue{})
+var rawValueType = reflect.TypeFor[RawValue]()
 
 // StringSize returns the encoded size of a string.
 func StringSize(s string) uint64 {