Fix panic when receiving a response after GrandPa warp sync has finis…

…hed (#650)
smol-dot · Jun 1, 2023 · fee7735 · fee7735
1 parent 929a68a
commit fee7735
Showing 1 changed file with 44 additions and 0 deletions.
diff --git a/lib/src/sync/all.rs b/lib/src/sync/all.rs
@@ -1722,6 +1722,20 @@ impl<TRq, TSrc, TBl> AllSync<TRq, TSrc, TBl> {
 
                 (user_data.user_data, ResponseOutcome::Queued)
             }
+            (
+                AllSyncInner::GrandpaWarpSync {
+                    inner: warp_sync::WarpSync::Finished(sync),
+                },
+                RequestMapping::WarpSync(request_id),
+            ) => {
+                let pos = sync
+                    .in_progress_requests
+                    .iter()
+                    .position(|(_, id, ..)| *id == request_id)
+                    .unwrap();
+                let (_, _, user_data, _) = sync.in_progress_requests.remove(pos);
+                (user_data.user_data, ResponseOutcome::Outdated)
+            }
 
             // Only the GrandPa warp syncing ever starts GrandPa warp sync requests.
             (_, RequestMapping::Inline(_, _, user_data)) => {
@@ -1781,6 +1795,21 @@ impl<TRq, TSrc, TBl> AllSync<TRq, TSrc, TBl> {
                 };
                 (user_data, ResponseOutcome::Queued)
             }
+            (
+                AllSyncInner::GrandpaWarpSync {
+                    inner: warp_sync::WarpSync::Finished(mut sync),
+                },
+                _,
+                RequestMapping::WarpSync(request_id),
+            ) => {
+                let pos = sync
+                    .in_progress_requests
+                    .iter()
+                    .position(|(_, id, ..)| *id == request_id)
+                    .unwrap();
+                let (_, _, user_data, _) = sync.in_progress_requests.remove(pos);
+                (user_data.user_data, ResponseOutcome::Outdated)
+            }
             // Only the GrandPa warp syncing ever starts GrandPa warp sync requests.
             (other, _, RequestMapping::Inline(_, _, user_data)) => {
                 self.inner = other;
@@ -1843,6 +1872,21 @@ impl<TRq, TSrc, TBl> AllSync<TRq, TSrc, TBl> {
                 };
                 (user_data.user_data, ResponseOutcome::Queued)
             }
+            (
+                AllSyncInner::GrandpaWarpSync {
+                    inner: warp_sync::WarpSync::Finished(mut sync),
+                },
+                _,
+                RequestMapping::WarpSync(request_id),
+            ) => {
+                let pos = sync
+                    .in_progress_requests
+                    .iter()
+                    .position(|(_, id, ..)| *id == request_id)
+                    .unwrap();
+                let (_, _, user_data, _) = sync.in_progress_requests.remove(pos);
+                (user_data.user_data, ResponseOutcome::Outdated)
+            }
             // Only the GrandPa warp syncing ever starts call proof requests.
             (other, _, RequestMapping::Inline(_, _, user_data)) => {
                 self.inner = other;