From d1888af4e5a8a7d6a93054ba135e61a517a2e984 Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Fri, 25 Dec 2020 18:08:46 -0600
Subject: [PATCH] rpcserver: Remove unused Filterer interface.

This removes the Filterer interface and related test infrastructure
since it is no longer used as of the removal of the v1 cfilter code.
---
 internal/rpcserver/interface.go              | 18 ---------------
 internal/rpcserver/rpcserver.go              |  3 ---
 internal/rpcserver/rpcserverhandlers_test.go | 24 --------------------
 server.go                                    |  3 ---
 4 files changed, 48 deletions(-)

diff --git a/internal/rpcserver/interface.go b/internal/rpcserver/interface.go
index fbfe0626..af7126e2 100644
--- a/internal/rpcserver/interface.go
+++ b/internal/rpcserver/interface.go
@@ -530,24 +530,6 @@ type BlockTemplater interface {
 	UpdateBlockTime(header *wire.BlockHeader) error
 }
 
-// Filterer provides an interface for retrieving a block's committed filter or
-// committed filter header.
-//
-// The interface contract requires that all of these methods are safe for
-// concurrent access.
-//
-// Deprecated: This will be removed in the next major version.  Use FiltererV2
-// instead.
-type Filterer interface {
-	// FilterByBlockHash returns the serialized contents of a block's regular or
-	// extended committed filter.
-	FilterByBlockHash(h *chainhash.Hash, filterType wire.FilterType) ([]byte, error)
-
-	// FilterHeaderByBlockHash returns the serialized contents of a block's regular
-	// or extended committed filter header.
-	FilterHeaderByBlockHash(h *chainhash.Hash, filterType wire.FilterType) ([]byte, error)
-}
-
 // FiltererV2 provides an interface for retrieving a block's version 2 GCS
 // filter.
 //
diff --git a/internal/rpcserver/rpcserver.go b/internal/rpcserver/rpcserver.go
index c8f09f0f..dcdef31d 100644
--- a/internal/rpcserver/rpcserver.go
+++ b/internal/rpcserver/rpcserver.go
@@ -6136,9 +6136,6 @@ type Config struct {
 	// LogManager defines the log manager for the RPC server to use.
 	LogManager LogManager
 
-	// Filterer defines the filterer for the RPC server to use.
-	Filterer Filterer
-
 	// FiltererV2 defines the V2 filterer for the RPC server to use.
 	FiltererV2 FiltererV2
 }
diff --git a/internal/rpcserver/rpcserverhandlers_test.go b/internal/rpcserver/rpcserverhandlers_test.go
index 4b6cb322..65d0317b 100644
--- a/internal/rpcserver/rpcserverhandlers_test.go
+++ b/internal/rpcserver/rpcserverhandlers_test.go
@@ -923,26 +923,6 @@ func (s *testSanityChecker) CheckBlockSanity(block *dcrutil.Block) error {
 	return s.checkBlockSanityErr
 }
 
-// testFilterer provides a mock filterer by implementing the Filterer interface.
-type testFilterer struct {
-	filterByBlockHash          []byte
-	filterByBlockHashErr       error
-	filterHeaderByBlockHash    []byte
-	filterHeaderByBlockHashErr error
-}
-
-// FilterByBlockHash returns a mocked regular or extended committed filter for
-// the given block hash.
-func (f *testFilterer) FilterByBlockHash(h *chainhash.Hash, filterType wire.FilterType) ([]byte, error) {
-	return f.filterByBlockHash, f.filterByBlockHashErr
-}
-
-// FilterHeaderByBlockHash returns a mocked regular or extended committed filter
-// header for the given block hash.
-func (f *testFilterer) FilterHeaderByBlockHash(h *chainhash.Hash, filterType wire.FilterType) ([]byte, error) {
-	return f.filterHeaderByBlockHash, f.filterHeaderByBlockHashErr
-}
-
 // testFiltererV2 provides a mock V2 filterer by implementing the FiltererV2
 // interface.
 type testFiltererV2 struct {
@@ -1315,7 +1295,6 @@ type rpcTest struct {
 	mockConnManager       *testConnManager
 	mockClock             *testClock
 	mockLogManager        *testLogManager
-	mockFilterer          *testFilterer
 	mockFiltererV2        *testFiltererV2
 	mockTxMempooler       *testTxMempooler
 	mockMiningAddrs       []dcrutil.Address
@@ -7758,9 +7737,6 @@ func testRPCServerHandler(t *testing.T, tests []rpcTest) {
 			if test.mockSanityChecker != nil {
 				rpcserverConfig.SanityChecker = test.mockSanityChecker
 			}
-			if test.mockFilterer != nil {
-				rpcserverConfig.Filterer = test.mockFilterer
-			}
 			if test.mockFiltererV2 != nil {
 				rpcserverConfig.FiltererV2 = test.mockFiltererV2
 			}
diff --git a/server.go b/server.go
index a19560ce..659ebc04 100644
--- a/server.go
+++ b/server.go
@@ -3897,9 +3897,6 @@ func newServer(ctx context.Context, listenAddrs []string, db database.DB, chainP
 		if s.addrIndex != nil {
 			rpcsConfig.AddrIndexer = s.addrIndex
 		}
-		if s.cfIndex != nil {
-			rpcsConfig.Filterer = s.cfIndex
-		}
 
 		s.rpcServer, err = rpcserver.New(&rpcsConfig)
 		if err != nil {