From a6d6e8ac410170eb1085b9e7b0388b1c67f95548 Mon Sep 17 00:00:00 2001
From: Undefinedor <wanghao@imwh.net>
Date: Tue, 5 Mar 2024 21:44:23 +0800
Subject: [PATCH] rpc: remove deprecated method "Notifier.Closed" (#29162)

---
 eth/downloader/api.go        | 2 --
 eth/filters/api.go           | 6 ------
 eth/tracers/api.go           | 4 ++--
 node/api.go                  | 2 --
 p2p/simulations/http_test.go | 2 --
 rpc/subscription.go          | 6 ------
 rpc/testservice_test.go      | 5 +----
 7 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/eth/downloader/api.go b/eth/downloader/api.go
index 6b8cb98e23..90c36afbb5 100644
--- a/eth/downloader/api.go
+++ b/eth/downloader/api.go
@@ -149,8 +149,6 @@ func (api *DownloaderAPI) Syncing(ctx context.Context) (*rpc.Subscription, error
 				notifier.Notify(rpcSub.ID, status)
 			case <-rpcSub.Err():
 				return
-			case <-notifier.Closed():
-				return
 			}
 		}
 	}()
diff --git a/eth/filters/api.go b/eth/filters/api.go
index 8cf701ec57..59103ac03c 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -179,8 +179,6 @@ func (api *FilterAPI) NewPendingTransactions(ctx context.Context, fullTx *bool)
 				}
 			case <-rpcSub.Err():
 				return
-			case <-notifier.Closed():
-				return
 			}
 		}
 	}()
@@ -241,8 +239,6 @@ func (api *FilterAPI) NewHeads(ctx context.Context) (*rpc.Subscription, error) {
 				notifier.Notify(rpcSub.ID, h)
 			case <-rpcSub.Err():
 				return
-			case <-notifier.Closed():
-				return
 			}
 		}
 	}()
@@ -278,8 +274,6 @@ func (api *FilterAPI) Logs(ctx context.Context, crit FilterCriteria) (*rpc.Subsc
 				}
 			case <-rpcSub.Err(): // client send an unsubscribe request
 				return
-			case <-notifier.Closed(): // connection dropped
-				return
 			}
 		}
 	}()
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
index 6833108205..fa8c881d1a 100644
--- a/eth/tracers/api.go
+++ b/eth/tracers/api.go
@@ -226,7 +226,7 @@ func (api *API) TraceChain(ctx context.Context, start, end rpc.BlockNumber, conf
 	}
 	sub := notifier.CreateSubscription()
 
-	resCh := api.traceChain(from, to, config, notifier.Closed())
+	resCh := api.traceChain(from, to, config, sub.Err())
 	go func() {
 		for result := range resCh {
 			notifier.Notify(sub.ID, result)
@@ -240,7 +240,7 @@ func (api *API) TraceChain(ctx context.Context, start, end rpc.BlockNumber, conf
 // the end block but excludes the start one. The return value will be one item per
 // transaction, dependent on the requested tracer.
 // The tracing procedure should be aborted in case the closed signal is received.
-func (api *API) traceChain(start, end *types.Block, config *TraceConfig, closed <-chan interface{}) chan *blockTraceResult {
+func (api *API) traceChain(start, end *types.Block, config *TraceConfig, closed <-chan error) chan *blockTraceResult {
 	reexec := defaultTraceReexec
 	if config != nil && config.Reexec != nil {
 		reexec = *config.Reexec
diff --git a/node/api.go b/node/api.go
index f81f394beb..a71ae6aa29 100644
--- a/node/api.go
+++ b/node/api.go
@@ -145,8 +145,6 @@ func (api *adminAPI) PeerEvents(ctx context.Context) (*rpc.Subscription, error)
 				return
 			case <-rpcSub.Err():
 				return
-			case <-notifier.Closed():
-				return
 			}
 		}
 	}()
diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go
index c53a49797b..c04308fe0b 100644
--- a/p2p/simulations/http_test.go
+++ b/p2p/simulations/http_test.go
@@ -282,8 +282,6 @@ func (t *TestAPI) Events(ctx context.Context) (*rpc.Subscription, error) {
 				return
 			case <-rpcSub.Err():
 				return
-			case <-notifier.Closed():
-				return
 			}
 		}
 	}()
diff --git a/rpc/subscription.go b/rpc/subscription.go
index 9cb0727547..d3dff32a27 100644
--- a/rpc/subscription.go
+++ b/rpc/subscription.go
@@ -145,12 +145,6 @@ func (n *Notifier) Notify(id ID, data any) error {
 	return nil
 }
 
-// Closed returns a channel that is closed when the RPC connection is closed.
-// Deprecated: use subscription error channel
-func (n *Notifier) Closed() <-chan interface{} {
-	return n.h.conn.closed()
-}
-
 // takeSubscription returns the subscription (if one has been created). No subscription can
 // be created after this call.
 func (n *Notifier) takeSubscription() *Subscription {
diff --git a/rpc/testservice_test.go b/rpc/testservice_test.go
index 7d873af667..69199e21b7 100644
--- a/rpc/testservice_test.go
+++ b/rpc/testservice_test.go
@@ -195,10 +195,7 @@ func (s *notificationTestService) SomeSubscription(ctx context.Context, n, val i
 				return
 			}
 		}
-		select {
-		case <-notifier.Closed():
-		case <-subscription.Err():
-		}
+		<-subscription.Err()
 		if s.unsubscribed != nil {
 			s.unsubscribed <- string(subscription.ID)
 		}