From f193a2101cf45adfa46de173f51ff83ed43d6ec5 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Wed, 22 Nov 2017 22:32:05 +0000
Subject: [PATCH] refactor: remove duplication of filtering logic

---
 render/filters.go | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/render/filters.go b/render/filters.go
index 8dba85ecd..6620344c7 100644
--- a/render/filters.go
+++ b/render/filters.go
@@ -167,27 +167,12 @@ type filterUnconnected struct {
 // Transform implements Transformer
 func (f filterUnconnected) Transform(input Nodes) Nodes {
 	connected := connected(input.Nodes)
-	output := report.Nodes{}
-	filtered := input.Filtered
-	for id, node := range input.Nodes {
-		if _, ok := connected[id]; ok || (f.onlyPseudo && !IsPseudoTopology(node)) {
-			output[id] = node
-		} else {
-			filtered++
+	return FilterFunc(func(node report.Node) bool {
+		if _, ok := connected[node.ID]; ok || (f.onlyPseudo && !IsPseudoTopology(node)) {
+			return true
 		}
-	}
-	// Deleted nodes also need to be cut as destinations in adjacency lists.
-	for id, node := range output {
-		newAdjacency := report.MakeIDList()
-		for _, dstID := range node.Adjacency {
-			if _, ok := output[dstID]; ok {
-				newAdjacency = newAdjacency.Add(dstID)
-			}
-		}
-		node.Adjacency = newAdjacency
-		output[id] = node
-	}
-	return Nodes{Nodes: output, Filtered: filtered}
+		return false
+	}).Transform(input)
 }
 
 // FilterUnconnected is a transformer that filters unconnected nodes