remove start
Juan Batiz-Benet committed
Sep 18, 2014 at 20:38 UTC
700b6ab99fe63e8566f598c079115fbe7ba3f1ec
4 files changed
+1
-17
net/mux/mux.go
+1
-1
@@ -82,7 +82,7 @@ func (m *Muxer) handleIncomingMessages(ctx context.Context) {
82
83
for {
84
if m == nil {
85
- panic("nix muxer")
85
+ panic("nil muxer")
86
}
87
88
select {
routing/dht/dht.go
-9
@@ -45,9 +45,6 @@ type IpfsDHT struct {
45
46
providers *ProviderManager
47
48
- // Signal to shutdown dht
49
- shutdown chan struct{}
50
-
48
// When this peer started up
49
birth time.Time
50
@@ -65,7 +62,6 @@ func NewDHT(p *peer.Peer, ps peer.Peerstore, net inet.Network, sender inet.Sende
62
dht.peerstore = ps
63
64
dht.providers = NewProviderManager(p.ID)
68
- dht.shutdown = make(chan struct{})
65
66
dht.routingTables = make([]*kb.RoutingTable, 3)
67
dht.routingTables[0] = kb.NewRoutingTable(20, kb.ConvertPeerID(p.ID), time.Millisecond*30)
@@ -75,11 +71,6 @@ func NewDHT(p *peer.Peer, ps peer.Peerstore, net inet.Network, sender inet.Sende
71
return dht
72
}
73
78
-// Start up background goroutines needed by the DHT
79
-func (dht *IpfsDHT) Start() {
80
- panic("the service is already started. rmv this method")
81
-}
82
-
74
// Connect to a new peer at the given address, ping and add to the routing table
75
func (dht *IpfsDHT) Connect(addr *ma.Multiaddr) (*peer.Peer, error) {
76
maddrstr, _ := addr.String()
routing/dht/dht_test.go
-5
@@ -41,7 +41,6 @@ func setupDHT(t *testing.T, p *peer.Peer) *IpfsDHT {
41
42
d := NewDHT(p, peerstore, net, dhts, ds.NewMapDatastore())
43
dhts.Handler = d
44
- d.Start()
44
return d
45
}
46
@@ -116,8 +115,6 @@ func TestPing(t *testing.T) {
115
dhtA := setupDHT(t, peerA)
116
dhtB := setupDHT(t, peerB)
117
119
- dhtA.Start()
120
- dhtB.Start()
118
defer dhtA.Halt()
119
defer dhtB.Halt()
120
@@ -150,8 +147,6 @@ func TestValueGetSet(t *testing.T) {
147
dhtA := setupDHT(t, peerA)
148
dhtB := setupDHT(t, peerB)
149
153
- dhtA.Start()
154
- dhtB.Start()
150
defer dhtA.Halt()
151
defer dhtB.Halt()
152
routing/dht/handlers.go
-2
@@ -180,8 +180,6 @@ func (dht *IpfsDHT) handleAddProvider(p *peer.Peer, pmes *Message) (*Message, er
180
// Halt stops all communications from this peer and shut down
181
// TODO -- remove this in favor of context
182
func (dht *IpfsDHT) Halt() {
183
- dht.shutdown <- struct{}{}
184
- dht.network.Close()
183
dht.providers.Halt()
184
}
185