Refactor getAccountStorageFormat()

Co-authored-by: Bastian Müller <[email protected]>
onflow · Nov 25, 2024 · c7cf012 · c7cf012
1 parent 9af92f6
commit c7cf012
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/runtime/storage.go b/runtime/storage.go
@@ -301,12 +301,16 @@ func (s *Storage) getAccountStorageFormat(
 	return storageFormatNew
 }
 
-func (s *Storage) getCachedAccountFormat(address common.Address) (isV1 bool, isV2 bool) {
+func (s *Storage) getCachedAccountFormat(address common.Address) (format storageFormat, known bool) {
 	isV1, cached := s.cachedV1Accounts[address]
 	if !cached {
-		return false, false
+		return storageFormatUnknown, false
+	}
+	if isV1 {
+		return storageFormatV1, true
+	} else {
+		return StorageFormatV2, true
 	}
-	return isV1, !isV1
 }
 
 // isV2Account returns true if given account is in account storage format v2.