Revert "Get positions script should not panic"

cadence/contracts/FlowALPv0.cdc

@@ -1927,29 +1927,13 @@ access(all) contract FlowALPv0 {
             )
 
             return PositionDetails(
-                id: pid,
                 balances: balances,
                 poolDefaultToken: self.defaultToken,
                 defaultTokenAvailableBalance: defaultTokenAvailable,
                 health: health
             )
         }
 
-        /// Returns the details of a given position, or nil if the position does not exist.
-        /// This is the non-panicking variant of getPositionDetails.
-        access(all) fun tryGetPositionDetails(pid: UInt64): PositionDetails? {
-            if self.debugLogging {
-                log("    [CONTRACT] tryGetPositionDetails(pid: \(pid))")
-            }
-
-            if self._tryBorrowPosition(pid: pid) == nil {
-                return nil
-            }
-
-            return self.getPositionDetails(pid: pid)
-        }
-
-
         /// Any external party can perform a manual liquidation on a position under the following circumstances:
         /// - the position has health < 1
         /// - the liquidation price offered is better than what is available on a DEX
@@ -4095,14 +4079,9 @@ access(all) contract FlowALPv0 {
             }
         }
 
-        /// Returns an authorized reference to the requested InternalPosition, or nil if it does not exist.
-        access(self) view fun _tryBorrowPosition(pid: UInt64): (auth(EImplementation) &InternalPosition)? {
-            return &self.positions[pid] as auth(EImplementation) &InternalPosition?
-        }
-
-        /// Returns an authorized reference to the requested InternalPosition or panics if the position does not exist.
+        /// Returns an authorized reference to the requested InternalPosition or `nil` if the position does not exist
         access(self) view fun _borrowPosition(pid: UInt64): auth(EImplementation) &InternalPosition {
-            return self._tryBorrowPosition(pid: pid)
+            return &self.positions[pid] as auth(EImplementation) &InternalPosition?
                 ?? panic("Invalid position ID \(pid) - could not find an InternalPosition with the requested ID in the Pool")
         }
 
@@ -4783,9 +4762,6 @@ access(all) contract FlowALPv0 {
     /// This structure is NOT used internally.
     access(all) struct PositionDetails {
 
-        /// The unique identifier of the position
-        access(all) let id: UInt64
-
         /// Balance details about each Vault Type deposited to the related Position
         access(all) let balances: [PositionBalance]
 
@@ -4799,13 +4775,11 @@ access(all) contract FlowALPv0 {
         access(all) let health: UFix128
 
         init(
-            id: UInt64,
             balances: [PositionBalance],
             poolDefaultToken: Type,
             defaultTokenAvailableBalance: UFix64,
             health: UFix128
         ) {
-            self.id = id
             self.balances = balances
             self.poolDefaultToken = poolDefaultToken
             self.defaultTokenAvailableBalance = defaultTokenAvailableBalance

cadence/scripts/flow-alp/get_positions_by_ids.cdc

@@ -1,6 +1,4 @@
 // Returns the details of multiple positions by their IDs.
-// Positions that no longer exist (e.g., closed between fetching IDs and executing this script)
-// are silently skipped.
 import "FlowALPv0"
 
 access(all) fun main(positionIDs: [UInt64]): [FlowALPv0.PositionDetails] {
@@ -11,9 +9,7 @@ access(all) fun main(positionIDs: [UInt64]): [FlowALPv0.PositionDetails] {
 
     let details: [FlowALPv0.PositionDetails] = []
     for id in positionIDs {
-        if let detail = pool.tryGetPositionDetails(pid: id) {
-            details.append(detail)
-        }
+        details.append(pool.getPositionDetails(pid: id))
     }
     return details
 }

cadence/tests/get_positions_by_ids_test.cdc

@@ -65,20 +65,4 @@ fun test_getPositionsByIDs() {
     let singleDetails = getPositionsByIDs(positionIDs: [UInt64(0)])
     Test.assertEqual(1, singleDetails.length)
     Test.assertEqual(details0.health, singleDetails[0].health)
-
-    // --- Closed positions are silently skipped ---
-    // Close position 1, then request both IDs — should only return position 0
-    closePosition(user: user, positionID: 1)
-    let afterClose = getPositionsByIDs(positionIDs: [UInt64(0), UInt64(1)])
-    Test.assertEqual(1, afterClose.length)
-    Test.assertEqual(details0.health, afterClose[0].health)
-
-    // --- All IDs closed/invalid returns empty array ---
-    closePosition(user: user, positionID: 0)
-    let allClosed = getPositionsByIDs(positionIDs: [UInt64(0), UInt64(1)])
-    Test.assertEqual(0, allClosed.length)
-
-    // --- Non-existent IDs are skipped ---
-    let nonExistent = getPositionsByIDs(positionIDs: [UInt64(999), UInt64(1000)])
-    Test.assertEqual(0, nonExistent.length)
 }

cadence/tests/test_helpers.cdc

@@ -810,16 +810,6 @@ fun getPositionsByIDs(positionIDs: [UInt64]): [FlowALPv0.PositionDetails] {
     return res.returnValue as! [FlowALPv0.PositionDetails]
 }
 
-access(all)
-fun tryGetPositionDetails(pid: UInt64): FlowALPv0.PositionDetails? {
-    let res = _executeScript(
-        "../scripts/flow-alp/try_get_position_details.cdc",
-        [pid]
-    )
-    Test.expect(res, Test.beSucceeded())
-    return res.returnValue as! FlowALPv0.PositionDetails?
-}
-
 access(all)
 fun closePosition(user: Test.TestAccount, positionID: UInt64) {
     let res = _executeTransaction(