From 48ba07f29eed5ee0f6e34360020a261dfe46ff43 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Tue, 24 May 2022 13:48:47 +0200
Subject: [PATCH] remove OpenedStream and ClosedStream from Notifiee interface
 (#250)

* remove TODO for PeerConnected and PeerDisconnected from Notifiee

This is now done via the event bus.

* remove OpenedStream and ClosedStream from Notifiee
---
 core/network/notifee.go      | 25 -------------------------
 core/network/notifee_test.go | 36 ------------------------------------
 2 files changed, 61 deletions(-)

diff --git a/core/network/notifee.go b/core/network/notifee.go
index 10ef72f1..bb2f3833 100644
--- a/core/network/notifee.go
+++ b/core/network/notifee.go
@@ -11,12 +11,6 @@ type Notifiee interface {
 	ListenClose(Network, ma.Multiaddr) // called when network stops listening on an addr
 	Connected(Network, Conn)           // called when a connection opened
 	Disconnected(Network, Conn)        // called when a connection closed
-	OpenedStream(Network, Stream)      // called when a stream opened
-	ClosedStream(Network, Stream)      // called when a stream closed
-
-	// TODO
-	// PeerConnected(Network, peer.ID)    // called when a peer connected
-	// PeerDisconnected(Network, peer.ID) // called when a peer disconnected
 }
 
 // NotifyBundle implements Notifiee by calling any of the functions set on it,
@@ -28,9 +22,6 @@ type NotifyBundle struct {
 
 	ConnectedF    func(Network, Conn)
 	DisconnectedF func(Network, Conn)
-
-	OpenedStreamF func(Network, Stream)
-	ClosedStreamF func(Network, Stream)
 }
 
 var _ Notifiee = (*NotifyBundle)(nil)
@@ -63,20 +54,6 @@ func (nb *NotifyBundle) Disconnected(n Network, c Conn) {
 	}
 }
 
-// OpenedStream calls OpenedStreamF if it is not null.
-func (nb *NotifyBundle) OpenedStream(n Network, s Stream) {
-	if nb.OpenedStreamF != nil {
-		nb.OpenedStreamF(n, s)
-	}
-}
-
-// ClosedStream calls ClosedStreamF if it is not null.
-func (nb *NotifyBundle) ClosedStream(n Network, s Stream) {
-	if nb.ClosedStreamF != nil {
-		nb.ClosedStreamF(n, s)
-	}
-}
-
 // Global noop notifiee. Do not change.
 var GlobalNoopNotifiee = &NoopNotifiee{}
 
@@ -88,5 +65,3 @@ func (nn *NoopNotifiee) Connected(n Network, c Conn)              {}
 func (nn *NoopNotifiee) Disconnected(n Network, c Conn)           {}
 func (nn *NoopNotifiee) Listen(n Network, addr ma.Multiaddr)      {}
 func (nn *NoopNotifiee) ListenClose(n Network, addr ma.Multiaddr) {}
-func (nn *NoopNotifiee) OpenedStream(Network, Stream)             {}
-func (nn *NoopNotifiee) ClosedStream(Network, Stream)             {}
diff --git a/core/network/notifee_test.go b/core/network/notifee_test.go
index 1948074a..12090d1f 100644
--- a/core/network/notifee_test.go
+++ b/core/network/notifee_test.go
@@ -85,39 +85,3 @@ func TestDisconnected(T *testing.T) {
 		T.Fatal("Disconnected should have been called")
 	}
 }
-
-func TestOpenedStream(T *testing.T) {
-	var notifee NotifyBundle
-	notifee.OpenedStream(nil, nil)
-
-	called := false
-	notifee.OpenedStreamF = func(Network, Stream) {
-		called = true
-	}
-	if called {
-		T.Fatal("called should be false")
-	}
-
-	notifee.OpenedStream(nil, nil)
-	if !called {
-		T.Fatal("OpenedStream should have been called")
-	}
-}
-
-func TestClosedStream(T *testing.T) {
-	var notifee NotifyBundle
-	notifee.ClosedStream(nil, nil)
-
-	called := false
-	notifee.ClosedStreamF = func(Network, Stream) {
-		called = true
-	}
-	if called {
-		T.Fatal("called should be false")
-	}
-
-	notifee.ClosedStream(nil, nil)
-	if !called {
-		T.Fatal("ClosedStream should have been called")
-	}
-}