Merge pull request #3370 from onflow/bastian/migration-fixes

onflow · May 23, 2024 · 0e7b177 · 0e7b177
2 parents 55aa3c4 + 1e55587
commit 0e7b177
Show file tree

Hide file tree

Showing 6 changed files with 305 additions and 80 deletions.
diff --git a/runtime/common/metering.go b/runtime/common/metering.go
@@ -256,7 +256,8 @@ var (
 	AccountCapabilitiesStringMemoryUsage              = NewRawStringMemoryUsage(len("Account.Capabilities()"))
 	AccountInboxStringMemoryUsage                     = NewRawStringMemoryUsage(len("Account.Inbox()"))
 	AccountStorageStringMemoryUsage                   = NewRawStringMemoryUsage(len("Account.Storage()"))
-	CapabilityValueStringMemoryUsage                  = NewRawStringMemoryUsage(len("Capability<>(address: , id: )"))
+	IDCapabilityValueStringMemoryUsage                = NewRawStringMemoryUsage(len("Capability<>(address: , id: )"))
+	PathCapabilityValueStringMemoryUsage              = NewRawStringMemoryUsage(len("Capability<>(address: , path: )"))
 	StorageCapabilityControllerValueStringMemoryUsage = NewRawStringMemoryUsage(len("StorageCapabilityController(borrowType: , capabilityID: , target: )"))
 	AccountCapabilityControllerValueStringMemoryUsage = NewRawStringMemoryUsage(len("AccountCapabilityController(borrowType: , capabilityID: )"))
 	PublishedValueStringMemoryUsage                   = NewRawStringMemoryUsage(len("PublishedValue<>()"))

diff --git a/runtime/format/capability.go b/runtime/format/capability.go
@@ -33,7 +33,7 @@ func Capability(borrowType string, address string, id string) string {
 
 func StorageCapabilityController(borrowType string, capabilityID string, target string) string {
 	return fmt.Sprintf(
-		"StorageCapabilityController(borrowType: %s, capabilityID: %s, target: %s)",
+		"StorageCapabilityController(borrowType: Type<%s>(), capabilityID: %s, target: %s)",
 		borrowType,
 		capabilityID,
 		target,
@@ -42,7 +42,7 @@ func StorageCapabilityController(borrowType string, capabilityID string, target
 
 func AccountCapabilityController(borrowType string, capabilityID string) string {
 	return fmt.Sprintf(
-		"AccountCapabilityController(borrowType: %s, capabilityID: %s)",
+		"AccountCapabilityController(borrowType: Type<%s>(), capabilityID: %s)",
 		borrowType,
 		capabilityID,
 	)

diff --git a/runtime/interpreter/value_capability.go b/runtime/interpreter/value_capability.go
@@ -131,7 +131,7 @@ func (v *IDCapabilityValue) RecursiveString(seenReferences SeenReferences) strin
 }
 
 func (v *IDCapabilityValue) MeteredString(interpreter *Interpreter, seenReferences SeenReferences, locationRange LocationRange) string {
-	common.UseMemory(interpreter, common.CapabilityValueStringMemoryUsage)
+	common.UseMemory(interpreter, common.IDCapabilityValueStringMemoryUsage)
 
 	return format.Capability(
 		v.BorrowType.MeteredString(interpreter),

diff --git a/runtime/interpreter/value_pathcapability.go b/runtime/interpreter/value_pathcapability.go
@@ -86,8 +86,28 @@ func (v *PathCapabilityValue) RecursiveString(seenReferences SeenReferences) str
 	}
 }
 
-func (v *PathCapabilityValue) MeteredString(_ *Interpreter, _ SeenReferences, _ LocationRange) string {
-	panic(errors.NewUnreachableError())
+func (v *PathCapabilityValue) MeteredString(
+	interpreter *Interpreter,
+	seenReferences SeenReferences,
+	locationRange LocationRange,
+) string {
+	common.UseMemory(interpreter, common.PathCapabilityValueStringMemoryUsage)
+
+	borrowType := v.BorrowType
+	if borrowType == nil {
+		return fmt.Sprintf(
+			"Capability(address: %s, path: %s)",
+			v.Address.MeteredString(interpreter, seenReferences, locationRange),
+			v.Path.MeteredString(interpreter, seenReferences, locationRange),
+		)
+	} else {
+		return fmt.Sprintf(
+			"Capability<%s>(address: %s, path: %s)",
+			borrowType.String(),
+			v.Address.MeteredString(interpreter, seenReferences, locationRange),
+			v.Path.MeteredString(interpreter, seenReferences, locationRange),
+		)
+	}
 }
 
 func (v *PathCapabilityValue) GetMember(_ *Interpreter, _ LocationRange, _ string) Value {

diff --git a/runtime/interpreter/value_storagecapabilitycontroller.go b/runtime/interpreter/value_storagecapabilitycontroller.go
@@ -133,8 +133,8 @@ func (v *StorageCapabilityControllerValue) String() string {
 func (v *StorageCapabilityControllerValue) RecursiveString(seenReferences SeenReferences) string {
 	return format.StorageCapabilityController(
 		v.BorrowType.String(),
-		v.TargetPath.RecursiveString(seenReferences),
 		v.CapabilityID.RecursiveString(seenReferences),
+		v.TargetPath.RecursiveString(seenReferences),
 	)
 }