Generic case to handle both pointer type and raw type

pkg/values/value.go

@@ -111,22 +111,6 @@ func Wrap(v any) (Value, error) {
 		return NewBytes(slice), nil
 	}
 
-	if isOracleIDsArray(v) {
-		arrayValue := reflect.ValueOf(v)
-		length := arrayValue.Len()
-
-		// Create a slice with the same length as the array
-		slice := make([]byte, length)
-
-		// Copy elements from the array to the slice
-		for i := 0; i < length; i++ {
-			thang := arrayValue.Index(i).Interface()
-			slice[i] = byte(thang.(commontypes.OracleID))
-		}
-
-		return NewBytes(slice), nil
-	}
-
 	if isByteArray(v) {
 		arrayValue := reflect.ValueOf(v)
 		length := arrayValue.Len()
@@ -181,7 +165,6 @@ func Wrap(v any) (Value, error) {
 		if reflect.Indirect(reflect.ValueOf(v)).Kind() == reflect.Slice {
 			return createListFromSlice(reflect.Indirect(reflect.ValueOf(v)))
 		}
-
 	case reflect.String:
 		return Wrap(val.Convert(reflect.TypeOf("")).Interface())
 	case reflect.Bool:
@@ -399,16 +382,10 @@ func unwrapTo[T any](underlying T, to any) error {
 		// eg: type FeedId string allows verification of FeedId's shape while unmarshalling
 		rTo := reflect.ValueOf(to)
 		rUnderlying := reflect.ValueOf(underlying)
-		underlyingPtr := reflect.PointerTo(rUnderlying.Type())
 		if rTo.Kind() != reflect.Pointer {
 			return fmt.Errorf("cannot unwrap to value of type: %T", to)
 		}
 
-		if rTo.CanConvert(underlyingPtr) {
-			reflect.Indirect(rTo.Convert(underlyingPtr)).Set(rUnderlying)
-			return nil
-		}
-
 		if rUnderlying.CanConvert(reflect.Indirect(rTo).Type()) {
 			conv := rUnderlying.Convert(reflect.Indirect(rTo).Type())
 			reflect.Indirect(rTo).Set(conv)