forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-19 21:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

common, common/hexutil: use reflect.TypeFor #32321 (#1434)

Browse source 
Co-authored-by: cui <cuiweixie@gmail.com>
This commit is contained in:
Daniel Liu 2025-09-06 17:13:56 +08:00 committed by GitHub
parent 1b09e585ab
commit d2859ecb9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/hexutil/json.go
View file

@ -28,11 +28,11 @@ import (
)
var (
bytesT = reflect.TypeOf(Bytes(nil))
bigT = reflect.TypeOf((*Big)(nil))
uintT = reflect.TypeOf(Uint(0))
uint64T = reflect.TypeOf(Uint64(0))
u256T = reflect.TypeOf((*uint256.Int)(nil))
bytesT = reflect.TypeFor[Bytes]()
bigT = reflect.TypeFor[*Big]()
uintT = reflect.TypeFor[Uint]()
uint64T = reflect.TypeFor[Uint64]()
u256T = reflect.TypeFor[*uint256.Int]()
)
// Bytes marshals/unmarshals as a JSON string with 0x prefix.

10
common/types.go
View file

@ -54,6 +54,9 @@ const (
)
var (
hashT = reflect.TypeFor[Hash]()
addressT = reflect.TypeFor[Address]()
// MaxHash represents the maximum possible hash value.
MaxHash = HexToHash("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
@ -71,11 +74,6 @@ var (
MintedRecordAddressBinary = HexToAddress("0x000000000000000000000000000000000000009a")
)
var (
hashT = reflect.TypeOf(Hash{})
addressT = reflect.TypeOf(Address{})
)
// Hash represents the 32 byte Keccak256 hash of arbitrary data.
type Hash [HashLength]byte
@ -438,7 +436,7 @@ func isString(input []byte) bool {
// UnmarshalJSON parses a hash in hex syntax.
func (d *Decimal) UnmarshalJSON(input []byte) error {
if !isString(input) {
return &json.UnmarshalTypeError{Value: "non-string", Type: reflect.TypeOf(uint64(0))}
return &json.UnmarshalTypeError{Value: "non-string", Type: reflect.TypeFor[uint64]()}
}
if i, err := strconv.ParseUint(string(input[1:len(input)-1]), 10, 64); err == nil {
*d = Decimal(i)