decouple core UFix64 value functionality from interpreter

Author: turbolent

interpreter/decode.go

@@ -851,9 +851,9 @@ func (d StorableDecoder) decodeUFix64() (UFix64Value, error) {
 	value, err := decodeUint64(d.decoder, d.memoryGauge)
 	if err != nil {
 		if e, ok := err.(*cbor.WrongTypeError); ok {
-			return 0, errors.NewUnexpectedError("unknown UFix64 encoding: %s", e.ActualType.String())
+			return UFix64Value{}, errors.NewUnexpectedError("unknown UFix64 encoding: %s", e.ActualType.String())
 		}
-		return 0, err
+		return UFix64Value{}, err
 	}
 
 	// Already metered at `decodeUint64`

interpreter/encode.go

@@ -480,23 +480,6 @@ func (v Fix64Value) Encode(e *atree.Encoder) error {
 	return e.CBOR.EncodeInt64(int64(v))
 }
 
-// Encode encodes UFix64Value as
-//
-//	cbor.Tag{
-//			Number:  CBORTagUFix64Value,
-//			Content: uint64(v),
-//	}
-func (v UFix64Value) Encode(e *atree.Encoder) error {
-	err := e.CBOR.EncodeRawBytes([]byte{
-		// tag number
-		0xd8, values.CBORTagUFix64Value,
-	})
-	if err != nil {
-		return err
-	}
-	return e.CBOR.EncodeUint64(uint64(v))
-}
-
 var _ atree.ContainerStorable = &SomeStorable{}
 
 func (s SomeStorable) Encode(e *atree.Encoder) error {

interpreter/storage.go

@@ -101,6 +101,9 @@ func ConvertStoredValue(gauge common.MemoryGauge, value atree.Value) (Value, err
 	case values.IntValue:
 		return IntValue{IntValue: value}, nil
 
+	case values.UFix64Value:
+		return UFix64Value{UFix64Value: value}, nil
+
 	case Value:
 		return value, nil
 

interpreter/value_bool.go

@@ -65,10 +65,8 @@ func (v BoolValue) Equal(_ ValueComparisonContext, _ LocationRange, other Value)
 	if !ok {
 		return false
 	}
-	return bool(
-		values.BoolValue(v).
-			EqualBool(values.BoolValue(otherBool)),
-	)
+	return values.BoolValue(v).
+		Equal(values.BoolValue(otherBool))
 }
 
 func (v BoolValue) Less(_ ValueComparisonContext, other ComparableValue, _ LocationRange) BoolValue {

interpreter/value_fix64.go

@@ -480,15 +480,15 @@ func ConvertFix64(memoryGauge common.MemoryGauge, value Value, locationRange Loc
 		return value
 
 	case UFix64Value:
-		if value > Fix64MaxValue {
+		if value.UFix64Value > Fix64MaxValue {
 			panic(OverflowError{
 				LocationRange: locationRange,
 			})
 		}
 		return NewFix64Value(
 			memoryGauge,
 			func() int64 {
-				return int64(value)
+				return int64(value.UFix64Value)
 			},
 		)
 

interpreter/value_int.go

@@ -21,7 +21,6 @@ package interpreter
 import (
 	"math"
 	"math/big"
-	"unsafe"
 
 	"github.com/onflow/atree"
 
@@ -38,8 +37,6 @@ type IntValue struct {
 	values.IntValue
 }
 
-const int64Size = int(unsafe.Sizeof(int64(0)))
-
 func NewIntValueFromInt64(memoryGauge common.MemoryGauge, value int64) IntValue {
 	return IntValue{
 		IntValue: values.NewIntValueFromInt64(memoryGauge, value),
@@ -397,7 +394,7 @@ func (v IntValue) Equal(_ ValueComparisonContext, _ LocationRange, other Value)
 		return false
 	}
 
-	return bool(v.IntValue.Equal(otherInt.IntValue))
+	return v.IntValue.Equal(otherInt.IntValue)
 }
 
 // HashInput returns a byte slice containing:

interpreter/value_int64.go

@@ -21,6 +21,7 @@ package interpreter
 import (
 	"encoding/binary"
 	"math"
+	"unsafe"
 
 	"github.com/onflow/atree"
 
@@ -36,6 +37,8 @@ import (
 
 type Int64Value int64
 
+const int64Size = int(unsafe.Sizeof(int64(0)))
+
 var Int64MemoryUsage = common.NewNumberMemoryUsage(int64Size)
 
 func NewInt64Value(gauge common.MemoryGauge, valueGetter func() int64) Int64Value {

interpreter/value_test.go

@@ -1857,13 +1857,15 @@ func TestBlockValue(t *testing.T) {
 			ByteArrayStaticType,
 			common.ZeroAddress,
 		),
-		5.0,
+		NewUnmeteredUFix64ValueWithInteger(5, EmptyLocationRange),
 	)
 
 	// static type test
-	var actualTs = block.Fields[sema.BlockTypeTimestampFieldName]
-	const expectedTs UFix64Value = 5.0
-	assert.Equal(t, expectedTs, actualTs)
+
+	assert.Equal(t,
+		NewUnmeteredUFix64ValueWithInteger(5, EmptyLocationRange),
+		block.Fields[sema.BlockTypeTimestampFieldName],
+	)
 }
 
 func TestEphemeralReferenceTypeConformance(t *testing.T) {