From 8f293e18c3e657b23fe0997ff2c5b7ff7dd534c2 Mon Sep 17 00:00:00 2001
From: Fedor Sakharov <fedor.sakharov@gmail.com>
Date: Fri, 8 Jan 2021 14:40:46 +0300
Subject: [PATCH] Exit from av-store loop on fatal error. (#2232)

* Fuse receive stream in Context

* Revert "Fuse receive stream in Context"

This reverts commit ddd26fa98f0ca1afbc22064e93010e4193a058b2.

* Exit on node shutdown from av-store loop

* Filter only context error
---
 polkadot/node/core/av-store/src/lib.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/polkadot/node/core/av-store/src/lib.rs b/polkadot/node/core/av-store/src/lib.rs
index 4905535a21..ca95d777a1 100644
--- a/polkadot/node/core/av-store/src/lib.rs
+++ b/polkadot/node/core/av-store/src/lib.rs
@@ -507,6 +507,10 @@ where
 		match res {
 			Err(e) => {
 				e.trace();
+
+				if let Error::Subsystem(SubsystemError::Context(_)) = e {
+					break;
+				}
 			}
 			Ok(true) => {
 				tracing::info!(target: LOG_TARGET, "received `Conclude` signal, exiting");