From cabd916517498d5927bdd829c64f39f98a76c0b5 Mon Sep 17 00:00:00 2001
From: William Banfield <4561443+williambanfield@users.noreply.github.com>
Date: Mon, 12 Jul 2021 15:20:02 -0400
Subject: [PATCH] Revert "statesync: keep peer despite lightblock query fail
 (#6692)" (#6696)

* Revert "statesync: keep peer despite lightblock query fail (#6692)"

This reverts commit 50b00dff7191a31b40310cc016a9543892669d67.
---
 internal/statesync/reactor.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/statesync/reactor.go b/internal/statesync/reactor.go
index 7bddb0eae..f50651b76 100644
--- a/internal/statesync/reactor.go
+++ b/internal/statesync/reactor.go
@@ -338,6 +338,9 @@ func (r *Reactor) backfill(
 					if lb == nil {
 						r.Logger.Info("backfill: peer didn't have block, fetching from another peer", "height", height)
 						queue.retry(height)
+						// As we are fetching blocks backwards, if this node doesn't have the block it likely doesn't
+						// have any prior ones, thus we remove it from the peer list.
+						r.dispatcher.removePeer(peer)
 						continue
 					}