decouple core of Int value implementation from interpreter into value…

…s package
onflow · Feb 13, 2025 · a8ca1c1 · a8ca1c1
1 parent e060afa
commit a8ca1c1
Show file tree

Hide file tree

Showing 6 changed files with 570 additions and 187 deletions.
diff --git a/interpreter/encode.go b/interpreter/encode.go
@@ -140,23 +140,6 @@ func (VoidValue) Encode(e *atree.Encoder) error {
 	return e.CBOR.EncodeRawBytes(cborVoidValue)
 }
 
-// Encode encodes the value as
-//
-//	cbor.Tag{
-//			Number:  CBORTagIntValue,
-//			Content: *big.Int(v.BigInt),
-//	}
-func (v IntValue) Encode(e *atree.Encoder) error {
-	err := e.CBOR.EncodeRawBytes([]byte{
-		// tag number
-		0xd8, values.CBORTagIntValue,
-	})
-	if err != nil {
-		return err
-	}
-	return e.CBOR.EncodeBigInt(v.BigInt)
-}
-
 // Encode encodes Int8Value as
 //
 //	cbor.Tag{

diff --git a/interpreter/storage.go b/interpreter/storage.go
@@ -98,6 +98,9 @@ func ConvertStoredValue(gauge common.MemoryGauge, value atree.Value) (Value, err
 	case values.BoolValue:
 		return BoolValue(value), nil
 
+	case values.IntValue:
+		return IntValue{IntValue: value}, nil
+
 	case Value:
 		return value, nil