Merge pull request #2727 from onflow/bastian/capability-cleanup

encoding/ccf/ccf_test.go

@@ -9781,7 +9781,7 @@ func TestEncodeType(t *testing.T) {
 	})
 }
 
-func TestEncodeIDCapability(t *testing.T) {
+func TestEncodeCapability(t *testing.T) {
 
 	t.Parallel()
 
@@ -9790,7 +9790,7 @@ func TestEncodeIDCapability(t *testing.T) {
 
 		testEncodeAndDecode(
 			t,
-			cadence.IDCapability{
+			cadence.Capability{
 				ID:      42,
 				Address: cadence.BytesToAddress([]byte{1, 2, 3, 4, 5}),
 			},
@@ -9836,13 +9836,13 @@ func TestEncodeIDCapability(t *testing.T) {
 			},
 		}
 
-		capability1 := cadence.IDCapability{
+		capability1 := cadence.Capability{
 			ID:         42,
 			Address:    cadence.BytesToAddress([]byte{1, 2, 3, 4, 5}),
 			BorrowType: cadence.IntType{},
 		}
 
-		capability2 := cadence.IDCapability{
+		capability2 := cadence.Capability{
 			ID:         43,
 			Address:    cadence.BytesToAddress([]byte{1, 2, 3, 4, 5}),
 			BorrowType: simpleStructType,
@@ -9961,7 +9961,7 @@ func TestEncodeIDCapability(t *testing.T) {
 
 		testEncodeAndDecode(
 			t,
-			cadence.IDCapability{
+			cadence.Capability{
 				ID:         42,
 				Address:    cadence.BytesToAddress([]byte{1, 2, 3, 4, 5}),
 				BorrowType: cadence.IntType{},
@@ -9999,12 +9999,12 @@ func TestEncodeIDCapability(t *testing.T) {
 	t.Run("array of Capability<Int>", func(t *testing.T) {
 		t.Parallel()
 
-		capability1 := cadence.IDCapability{
+		capability1 := cadence.Capability{
 			ID:         42,
 			Address:    cadence.BytesToAddress([]byte{1, 2, 3, 4, 5}),
 			BorrowType: cadence.IntType{},
 		}
-		capability2 := cadence.IDCapability{
+		capability2 := cadence.Capability{
 			ID:         43,
 			Address:    cadence.BytesToAddress([]byte{1, 2, 3, 4, 5}),
 			BorrowType: cadence.IntType{},

encoding/ccf/decode.go

@@ -1405,7 +1405,7 @@ func (d *Decoder) decodeCapability(typ *cadence.CapabilityType, types *cadenceTy
 		return nil, err
 	}
 
-	return cadence.NewMeteredIDCapability(
+	return cadence.NewMeteredCapability(
 		d.gauge,
 		id.(cadence.UInt64),
 		address.(cadence.Address),

encoding/ccf/encode.go

@@ -593,8 +593,8 @@ func (e *Encoder) encodeValue(
 		// If x.StaticType is nil, type value is encoded as nil.
 		return e.encodeNullableTypeValue(v.StaticType, ccfTypeIDByCadenceType{})
 
-	case cadence.IDCapability:
-		return e.encodeIDCapability(v)
+	case cadence.Capability:
+		return e.encodeCapability(v)
 
 	case cadence.Enum:
 		return e.encodeEnum(v, tids)
@@ -1106,15 +1106,15 @@ func (e *Encoder) encodePath(x cadence.Path) error {
 	return e.enc.EncodeString(x.Identifier)
 }
 
-// encodeIDCapability encodes cadence.IDCapability as
+// encodeCapability encodes cadence.Capability as
 // language=CDDL
 // id-capability-value = [
 //
 //	address: address-value,
 //	id: uint64-value
 //
 // ]
-func (e *Encoder) encodeIDCapability(capability cadence.IDCapability) error {
+func (e *Encoder) encodeCapability(capability cadence.Capability) error {
 	// Encode array head with length 2.
 	err := e.enc.EncodeRawBytes([]byte{
 		// array, 2 items follow

encoding/json/decode.go

@@ -1377,7 +1377,7 @@ func (d *Decoder) decodeTypeValue(valueJSON any) cadence.TypeValue {
 func (d *Decoder) decodeCapability(valueJSON any) cadence.Capability {
 	obj := toObject(valueJSON)
 
-	return cadence.NewMeteredIDCapability(
+	return cadence.NewMeteredCapability(
 		d.gauge,
 		d.decodeUInt64(obj.Get(idKey)),
 		d.decodeAddress(obj.Get(addressKey)),

encoding/json/encode.go

@@ -206,7 +206,7 @@ type jsonTypeValue struct {
 	StaticType jsonValue `json:"staticType"`
 }
 
-type jsonIDCapabilityValue struct {
+type jsonCapabilityValue struct {
 	BorrowType jsonValue `json:"borrowType"`
 	Address    string    `json:"address"`
 	ID         string    `json:"id"`
@@ -335,8 +335,8 @@ func Prepare(v cadence.Value) jsonValue {
 		return preparePath(v)
 	case cadence.TypeValue:
 		return prepareTypeValue(v)
-	case cadence.IDCapability:
-		return prepareIDCapability(v)
+	case cadence.Capability:
+		return prepareCapability(v)
 	case cadence.Enum:
 		return prepareEnum(v)
 	case cadence.Attachment:
@@ -960,10 +960,10 @@ func prepareTypeValue(typeValue cadence.TypeValue) jsonValue {
 	}
 }
 
-func prepareIDCapability(capability cadence.IDCapability) jsonValue {
+func prepareCapability(capability cadence.Capability) jsonValue {
 	return jsonValueObject{
 		Type: capabilityTypeStr,
-		Value: jsonIDCapabilityValue{
+		Value: jsonCapabilityValue{
 			ID:         encodeUInt(uint64(capability.ID)),
 			Address:    encodeBytes(capability.Address.Bytes()),
 			BorrowType: prepareType(capability.BorrowType, typePreparationResults{}),

encoding/json/encoding_test.go

@@ -2754,13 +2754,13 @@ func TestEncodeType(t *testing.T) {
 	})
 }
 
-func TestEncodeIDCapability(t *testing.T) {
+func TestEncodeCapability(t *testing.T) {
 
 	t.Parallel()
 
 	testEncodeAndDecode(
 		t,
-		cadence.NewIDCapability(
+		cadence.NewCapability(
 			6,
 			cadence.BytesToAddress([]byte{1, 2, 3, 4, 5}),
 			cadence.IntType{},

runtime/common/memorykind.go

@@ -39,7 +39,7 @@ const (
 	MemoryKindOptionalValue
 	MemoryKindTypeValue
 	MemoryKindPathValue
-	MemoryKindIDCapabilityValue
+	MemoryKindCapabilityValue
 	MemoryKindStorageReferenceValue
 	MemoryKindAccountReferenceValue
 	MemoryKindEphemeralReferenceValue
@@ -104,7 +104,7 @@ const (
 	MemoryKindCadenceEnumValueSize
 	MemoryKindCadencePathValue
 	MemoryKindCadenceTypeValue
-	MemoryKindCadenceIDCapabilityValue
+	MemoryKindCadenceCapabilityValue
 	MemoryKindCadenceFunctionValue
 
 	// Cadence Types

runtime/common/metering.go

@@ -146,7 +146,7 @@ var (
 	BoundFunctionValueMemoryUsage               = NewConstantMemoryUsage(MemoryKindBoundFunctionValue)
 	HostFunctionValueMemoryUsage                = NewConstantMemoryUsage(MemoryKindHostFunctionValue)
 	InterpretedFunctionValueMemoryUsage         = NewConstantMemoryUsage(MemoryKindInterpretedFunctionValue)
-	IDCapabilityValueMemoryUsage                = NewConstantMemoryUsage(MemoryKindIDCapabilityValue)
+	CapabilityValueMemoryUsage                  = NewConstantMemoryUsage(MemoryKindCapabilityValue)
 	EphemeralReferenceValueMemoryUsage          = NewConstantMemoryUsage(MemoryKindEphemeralReferenceValue)
 	StorageReferenceValueMemoryUsage            = NewConstantMemoryUsage(MemoryKindStorageReferenceValue)
 	AccountReferenceValueMemoryUsage            = NewConstantMemoryUsage(MemoryKindAccountReferenceValue)
@@ -202,7 +202,7 @@ var (
 	CadenceEnumValueBaseMemoryUsage       = NewConstantMemoryUsage(MemoryKindCadenceEnumValueBase)
 	CadenceAddressValueMemoryUsage        = NewConstantMemoryUsage(MemoryKindCadenceAddressValue)
 	CadenceBoolValueMemoryUsage           = NewConstantMemoryUsage(MemoryKindCadenceBoolValue)
-	CadenceIDCapabilityValueMemoryUsage   = NewConstantMemoryUsage(MemoryKindCadenceIDCapabilityValue)
+	CadenceCapabilityValueMemoryUsage     = NewConstantMemoryUsage(MemoryKindCadenceCapabilityValue)
 	CadenceFunctionValueMemoryUsage       = NewConstantMemoryUsage(MemoryKindCadenceFunctionValue)
 	CadenceKeyValuePairMemoryUsage        = NewConstantMemoryUsage(MemoryKindCadenceKeyValuePair)
 	CadenceOptionalValueMemoryUsage       = NewConstantMemoryUsage(MemoryKindCadenceOptionalValue)
@@ -254,7 +254,7 @@ var (
 	AuthAccountCapabilitiesStringMemoryUsage          = NewRawStringMemoryUsage(len("AuthAccount.Capabilities()"))
 	PublicAccountCapabilitiesStringMemoryUsage        = NewRawStringMemoryUsage(len("PublicAccount.Capabilities()"))
 	AuthAccountInboxStringMemoryUsage                 = NewRawStringMemoryUsage(len("AuthAccount.Inbox()"))
-	IDCapabilityValueStringMemoryUsage                = NewRawStringMemoryUsage(len("Capability<>(address: , id: )"))
+	CapabilityValueStringMemoryUsage                  = NewRawStringMemoryUsage(len("Capability<>(address: , id: )"))
 	StorageCapabilityControllerValueStringMemoryUsage = NewRawStringMemoryUsage(len("StorageCapabilityController(borrowType: , capabilityID: , target: )"))
 	AccountCapabilityControllerValueStringMemoryUsage = NewRawStringMemoryUsage(len("AccountCapabilityController(borrowType: , capabilityID: )"))
 	PublishedValueStringMemoryUsage                   = NewRawStringMemoryUsage(len("PublishedValue<>()"))

runtime/convertValues.go

@@ -229,8 +229,8 @@ func exportValueWithInterpreter(
 		return exportPathValue(inter, v)
 	case interpreter.TypeValue:
 		return exportTypeValue(v, inter), nil
-	case *interpreter.IDCapabilityValue:
-		return exportIDCapabilityValue(v, inter)
+	case *interpreter.CapabilityValue:
+		return exportCapabilityValue(v, inter)
 	case *interpreter.EphemeralReferenceValue:
 		// Break recursion through references
 		if _, ok := seenReferences[v]; ok {
@@ -626,14 +626,14 @@ func exportTypeValue(v interpreter.TypeValue, inter *interpreter.Interpreter) ca
 	)
 }
 
-func exportIDCapabilityValue(
-	v *interpreter.IDCapabilityValue,
+func exportCapabilityValue(
+	v *interpreter.CapabilityValue,
 	inter *interpreter.Interpreter,
-) (cadence.IDCapability, error) {
+) (cadence.Capability, error) {
 	borrowType := inter.MustConvertStaticToSemaType(v.BorrowType)
 	exportedBorrowType := ExportMeteredType(inter, borrowType, map[sema.TypeID]cadence.Type{})
 
-	return cadence.NewMeteredIDCapability(
+	return cadence.NewMeteredCapability(
 		inter,
 		cadence.NewMeteredUInt64(inter, uint64(v.ID)),
 		cadence.NewMeteredAddress(inter, v.Address),
@@ -814,8 +814,8 @@ func (i valueImporter) importValue(value cadence.Value, expectedType sema.Type)
 		)
 	case cadence.TypeValue:
 		return i.importTypeValue(v.StaticType)
-	case cadence.IDCapability:
-		return i.importIDCapability(
+	case cadence.Capability:
+		return i.importCapability(
 			v.ID,
 			v.Address,
 			v.BorrowType,
@@ -1099,12 +1099,12 @@ func (i valueImporter) importTypeValue(v cadence.Type) (interpreter.TypeValue, e
 	return interpreter.NewTypeValue(inter, typ), nil
 }
 
-func (i valueImporter) importIDCapability(
+func (i valueImporter) importCapability(
 	id cadence.UInt64,
 	address cadence.Address,
 	borrowType cadence.Type,
 ) (
-	*interpreter.IDCapabilityValue,
+	*interpreter.CapabilityValue,
 	error,
 ) {
 	_, ok := borrowType.(*cadence.ReferenceType)
@@ -1122,7 +1122,7 @@ func (i valueImporter) importIDCapability(
 		common.Address(address),
 	)
 
-	return interpreter.NewIDCapabilityValue(
+	return interpreter.NewCapabilityValue(
 		inter,
 		i.importUInt64(id),
 		addressValue,