From 700b6ab99fe63e8566f598c079115fbe7ba3f1ec Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Thu, 18 Sep 2014 20:38:24 -0700 Subject: [PATCH] remove start --- net/mux/mux.go | 2 +- routing/dht/dht.go | 9 --------- routing/dht/dht_test.go | 5 ----- routing/dht/handlers.go | 2 -- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/net/mux/mux.go b/net/mux/mux.go index 2f4e3b39e..f2dda275a 100644 --- a/net/mux/mux.go +++ b/net/mux/mux.go @@ -82,7 +82,7 @@ func (m *Muxer) handleIncomingMessages(ctx context.Context) { for { if m == nil { - panic("nix muxer") + panic("nil muxer") } select { diff --git a/routing/dht/dht.go b/routing/dht/dht.go index 13311f614..d1b610c5e 100644 --- a/routing/dht/dht.go +++ b/routing/dht/dht.go @@ -45,9 +45,6 @@ type IpfsDHT struct { providers *ProviderManager - // Signal to shutdown dht - shutdown chan struct{} - // When this peer started up birth time.Time @@ -65,7 +62,6 @@ func NewDHT(p *peer.Peer, ps peer.Peerstore, net inet.Network, sender inet.Sende dht.peerstore = ps dht.providers = NewProviderManager(p.ID) - dht.shutdown = make(chan struct{}) dht.routingTables = make([]*kb.RoutingTable, 3) 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 return dht } -// Start up background goroutines needed by the DHT -func (dht *IpfsDHT) Start() { - panic("the service is already started. rmv this method") -} - // Connect to a new peer at the given address, ping and add to the routing table func (dht *IpfsDHT) Connect(addr *ma.Multiaddr) (*peer.Peer, error) { maddrstr, _ := addr.String() diff --git a/routing/dht/dht_test.go b/routing/dht/dht_test.go index 70fbb2ba2..2ed917401 100644 --- a/routing/dht/dht_test.go +++ b/routing/dht/dht_test.go @@ -41,7 +41,6 @@ func setupDHT(t *testing.T, p *peer.Peer) *IpfsDHT { d := NewDHT(p, peerstore, net, dhts, ds.NewMapDatastore()) dhts.Handler = d - d.Start() return d } @@ -116,8 +115,6 @@ func TestPing(t *testing.T) { dhtA := setupDHT(t, peerA) dhtB := setupDHT(t, peerB) - dhtA.Start() - dhtB.Start() defer dhtA.Halt() defer dhtB.Halt() @@ -150,8 +147,6 @@ func TestValueGetSet(t *testing.T) { dhtA := setupDHT(t, peerA) dhtB := setupDHT(t, peerB) - dhtA.Start() - dhtB.Start() defer dhtA.Halt() defer dhtB.Halt() diff --git a/routing/dht/handlers.go b/routing/dht/handlers.go index ddf76a669..a12a2f3d4 100644 --- a/routing/dht/handlers.go +++ b/routing/dht/handlers.go @@ -180,8 +180,6 @@ func (dht *IpfsDHT) handleAddProvider(p *peer.Peer, pmes *Message) (*Message, er // Halt stops all communications from this peer and shut down // TODO -- remove this in favor of context func (dht *IpfsDHT) Halt() { - dht.shutdown <- struct{}{} - dht.network.Close() dht.providers.Halt() }