Merge pull request #18 from libp2p/fix/remove-notifier

fix: remove notifier

go.mod

@@ -5,5 +5,4 @@ require (
 	github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec // indirect
 	github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8
 	github.com/libp2p/go-nat v0.0.3
-	github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f
 )

go.sum

@@ -34,8 +34,6 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc h1:9lDbC6Rz4bwmou+oE6Dt4Cb2BGMur5eR/GYptkKUVHo=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
-github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f h1:M/lL30eFZTKnomXY6huvM6G0+gVquFNf6mxghaWlFUg=
-github.com/whyrusleeping/go-notifier v0.0.0-20170827234753-097c5d47330f/go.mod h1:cZNvX9cFybI01GriPRMXDtczuvUhgbcYr9iCGaNlRv8=
 golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190227160552-c95aed5357e7 h1:C2F/nMkR/9sfUTpvR3QrjBuTdvMUC/cFajkphs1YLQo=
 golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

nat.go

@@ -74,8 +74,6 @@ type NAT struct {
 
 	mappingmu sync.RWMutex // guards mappings
 	mappings  map[*mapping]struct{}
-
-	Notifier
 }
 
 func newNAT(realNAT nat.NAT) *NAT {
@@ -186,10 +184,6 @@ func (nat *NAT) establishMapping(m *mapping) {
 		m.setExternalPort(0) // clear mapping
 		// TODO: log.Event
 		log.Warningf("failed to establish port mapping: %s", err)
-		nat.Notifier.notifyAll(func(n Notifiee) {
-			n.MappingFailed(nat, m, oldport, err)
-		})
-
 		// we do not close if the mapping failed,
 		// because it may work again next time.
 		return
@@ -199,12 +193,5 @@ func (nat *NAT) establishMapping(m *mapping) {
 	log.Debugf("NAT Mapping: %s --> %s (%s)", m.ExternalPort(), m.InternalPort(), m.Protocol())
 	if oldport != 0 && newport != oldport {
 		log.Debugf("failed to renew same port mapping: ch %d -> %d", oldport, newport)
-		nat.Notifier.notifyAll(func(n Notifiee) {
-			n.MappingChanged(nat, m, oldport, newport)
-		})
 	}
-
-	nat.Notifier.notifyAll(func(n Notifiee) {
-		n.MappingSuccess(nat, m)
-	})
 }