From 63b3df4b0968bde476db0a6d7a08ed1e3ad23943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20M=C3=BCller?= <bastian@turbolent.com>
Date: Wed, 7 Feb 2024 07:22:03 -0800
Subject: [PATCH] temorarily revert "handle optional storage references"

This temporarily reverts commit 2414df1e21b1bf8d4a3c0235f655b67a15687024.

The revert is needed to align the public and private code.
---
 runtime/interpreter/interpreter_expression.go |  11 +-
 runtime/storage_test.go                       | 125 ------------------
 2 files changed, 2 insertions(+), 134 deletions(-)

diff --git a/runtime/interpreter/interpreter_expression.go b/runtime/interpreter/interpreter_expression.go
index 51cb8f2133..43ebc3ce59 100644
--- a/runtime/interpreter/interpreter_expression.go
+++ b/runtime/interpreter/interpreter_expression.go
@@ -302,15 +302,8 @@ func (interpreter *Interpreter) checkMemberAccess(
 		}
 	}
 
-	// NOTE: accesses of (optional) storage reference values
-	// are already checked in StorageReferenceValue.dereference
-	_, isStorageReference := target.(*StorageReferenceValue)
-	if !isStorageReference {
-		if optional, ok := target.(*SomeValue); ok {
-			_, isStorageReference = optional.value.(*StorageReferenceValue)
-		}
-	}
-	if isStorageReference {
+	if _, ok := target.(*StorageReferenceValue); ok {
+		// NOTE: Storage reference value accesses are already checked in  StorageReferenceValue.dereference
 		return
 	}
 
diff --git a/runtime/storage_test.go b/runtime/storage_test.go
index e1b429c9a0..b90f76d35e 100644
--- a/runtime/storage_test.go
+++ b/runtime/storage_test.go
@@ -4192,128 +4192,3 @@ func TestRuntimeStorageIteration(t *testing.T) {
 		})
 	})
 }
-
-func TestRuntimeStorageReferenceAccess(t *testing.T) {
-
-	t.Parallel()
-
-	runtime := newTestInterpreterRuntime()
-	runtime.defaultConfig.ResourceOwnerChangeHandlerEnabled = true
-
-	address := common.MustBytesToAddress([]byte{0x1})
-
-	ledger := newTestLedger(nil, nil)
-
-	deployTx := DeploymentTransaction("Test", []byte(`
-      pub contract Test {
-
-          pub resource R {
-              pub var balance: Int
-
-              init() {
-                  self.balance = 10
-              }
-          }
-
-          pub fun createR(): @R {
-              return <-create R()
-          }
-      }
-    `))
-
-	accountCodes := map[Location][]byte{}
-	var events []cadence.Event
-
-	runtimeInterface := &testRuntimeInterface{
-		storage: ledger,
-		getSigningAccounts: func() ([]Address, error) {
-			return []Address{address}, nil
-		},
-		resolveLocation: singleIdentifierLocationResolver(t),
-		updateAccountContractCode: func(location common.AddressLocation, code []byte) error {
-			accountCodes[location] = code
-			return nil
-		},
-		getAccountContractCode: func(location common.AddressLocation) (code []byte, err error) {
-			code = accountCodes[location]
-			return code, nil
-		},
-		emitEvent: func(event cadence.Event) error {
-			events = append(events, event)
-			return nil
-		},
-	}
-
-	nextTransactionLocation := newTransactionLocationGenerator()
-
-	// Deploy contract
-
-	err := runtime.ExecuteTransaction(
-		Script{
-			Source: deployTx,
-		},
-		Context{
-			Interface: runtimeInterface,
-			Location:  nextTransactionLocation(),
-		},
-	)
-	require.NoError(t, err)
-
-	t.Run("top-level reference", func(t *testing.T) {
-
-		transferTx := []byte(`
-          import Test from 0x1
-
-          transaction {
-              prepare(signer: AuthAccount) {
-                  signer.save(<-Test.createR(), to: /storage/test)
-                  let ref = signer.borrow<&Test.R>(from: /storage/test)!
-                  let value <- signer.load<@Test.R>(from: /storage/test)!
-                  destroy value
-                  ref.balance
-              }
-          }
-        `)
-
-		err = runtime.ExecuteTransaction(
-			Script{
-				Source: transferTx,
-			},
-			Context{
-				Interface: runtimeInterface,
-				Location:  nextTransactionLocation(),
-			},
-		)
-		RequireError(t, err)
-		require.ErrorAs(t, err, &interpreter.DereferenceError{})
-	})
-
-	t.Run("optional reference", func(t *testing.T) {
-
-		transferTx := []byte(`
-          import Test from 0x1
-
-          transaction {
-              prepare(signer: AuthAccount) {
-                  signer.save(<-Test.createR(), to: /storage/test)
-                  let ref = signer.borrow<&Test.R>(from: /storage/test)
-                  let value <- signer.load<@Test.R>(from: /storage/test)!
-                  destroy value
-                  ref?.balance
-              }
-          }
-        `)
-
-		err = runtime.ExecuteTransaction(
-			Script{
-				Source: transferTx,
-			},
-			Context{
-				Interface: runtimeInterface,
-				Location:  nextTransactionLocation(),
-			},
-		)
-		RequireError(t, err)
-		require.ErrorAs(t, err, &interpreter.DereferenceError{})
-	})
-}