diff --git a/common/hexutil/json.go b/common/hexutil/json.go index 8e04dcf327..c55af85d3d 100644 --- a/common/hexutil/json.go +++ b/common/hexutil/json.go @@ -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. diff --git a/common/types.go b/common/types.go index 678e7d611e..c51b1a9645 100644 --- a/common/types.go +++ b/common/types.go @@ -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)