Fix reference invalidation

onflow · Apr 20, 2023 · 46b6996 · 46b6996
1 parent 19019ff
commit 46b6996
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/encoding/json/decode.go b/encoding/json/decode.go
@@ -135,7 +135,7 @@ const (
 	typeParametersKey = "typeParameters"
 	returnKey         = "return"
 	typeBoundKey      = "typeBound"
-	purityKey       = "purity"
+	purityKey         = "purity"
 )
 
 func (d *Decoder) decodeJSON(v any) cadence.Value {

diff --git a/encoding/json/encode.go b/encoding/json/encode.go
@@ -849,7 +849,7 @@ func prepareType(typ cadence.Type, results typePreparationResults) jsonValue {
 			Initializers: prepareInitializers(typ.Initializers, results),
 		}
 	case *cadence.FunctionType:
-		typeJson :=  jsonFunctionType{
+		typeJson := jsonFunctionType{
 			Kind:           "Function",
 			TypeParameters: prepareTypeParameters(typ.TypeParameters, results),
 			Parameters:     prepareParameters(typ.Parameters, results),

diff --git a/runtime/attachments_test.go b/runtime/attachments_test.go
@@ -170,12 +170,8 @@ func TestAccountAttachmentExportFailure(t *testing.T) {
 		import Test from 0x1
 		pub fun main(): &Test.A? { 
 			let r <- Test.makeRWithA()
-
-			let acc = getAuthAccount(0x1)
-			acc.save(<-r, to: /storage/r)
-			var rRef = acc.borrow<&Test.R>(from: /storage/r)!
-
-			let a = rRef[Test.A]
+			let a = r[Test.A]
+			destroy r
 			return a
 		}
 	 `)
@@ -227,7 +223,7 @@ func TestAccountAttachmentExportFailure(t *testing.T) {
 		},
 	)
 	require.Error(t, err)
-	require.ErrorAs(t, err, &interpreter.InvalidatedResourceError{})
+	require.ErrorAs(t, err, &interpreter.DestroyedResourceError{})
 }
 
 func TestAccountAttachmentExport(t *testing.T) {

diff --git a/runtime/convertValues_test.go b/runtime/convertValues_test.go
@@ -5341,7 +5341,16 @@ func TestDestroyedResourceReferenceExport(t *testing.T) {
         pub fun main(): &S  {
             var s <- create S()
             var ref = &s as &S
+
+            // Just to trick the checker,
+            // and get pass the static referenced resource invalidation analysis.
+            var ref2 = getRef(ref)
+
             destroy s
+            return ref2!
+        }
+
+        pub fun getRef(_ ref: &S): &S  {
             return ref
         }
 	 `)

diff --git a/runtime/tests/interpreter/function_test.go b/runtime/tests/interpreter/function_test.go
@@ -19,15 +19,15 @@
 package interpreter_test
 
 import (
-	"github.com/onflow/cadence/runtime/sema"
-	"github.com/onflow/cadence/runtime/tests/checker"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/interpreter"
+	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/runtime/tests/checker"
 	"github.com/onflow/cadence/runtime/tests/utils"
 )
 

diff --git a/runtime/tests/interpreter/uuid_test.go b/runtime/tests/interpreter/uuid_test.go
@@ -88,7 +88,8 @@ func TestInterpretResourceUUID(t *testing.T) {
 		interpreter.ProgramFromChecker(importingChecker),
 		importingChecker.Location,
 		&interpreter.Config{
-			Storage: storage,
+			InvalidatedResourceValidationEnabled: true,
+			Storage:                              storage,
 			UUIDHandler: func() (uint64, error) {
 				defer func() { uuid++ }()
 				return uuid, nil