From a09e88d4bfee6e147246cd5f4eef5340eaadd360 Mon Sep 17 00:00:00 2001 From: zsfelfoldi Date: Sun, 26 Jun 2016 11:25:34 +0200 Subject: [PATCH] disable drop, remove prints --- eth/filters/api.go | 5 ----- eth/filters/filter_system.go | 3 --- les/fetcher.go | 4 +++- les/handler.go | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/eth/filters/api.go b/eth/filters/api.go index 311cd146e5..fd1cbd9137 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -138,7 +138,6 @@ done: // NewBlockFilter create a new filter that returns blocks that are included into the canonical chain. func (s *PublicFilterAPI) NewBlockFilter() (string, error) { -fmt.Println("NewBlockFilter") externalId, err := newFilterId() if err != nil { return "", err @@ -156,10 +155,8 @@ fmt.Println("NewBlockFilter") filter.BlockCallback = func(block *types.Block, logs vm.Logs) { s.blockMu.Lock() defer s.blockMu.Unlock() -fmt.Println("callback") if queue := s.blockQueue[id]; queue != nil { -fmt.Println(" add") queue.add(block.Hash()) } } @@ -501,10 +498,8 @@ func (s *PublicFilterAPI) blockFilterChanged(id int) []common.Hash { s.blockMu.Lock() defer s.blockMu.Unlock() -fmt.Println("blockFilterChanged") if s.blockQueue[id] != nil { res := s.blockQueue[id].get() -fmt.Println(" len = ", len(res)) return res } return nil diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 104f6e55ae..4343dfa21c 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -134,12 +134,9 @@ func (fs *FilterSystem) filterLoop() { for event := range fs.sub.Chan() { switch ev := event.Data.(type) { case core.ChainEvent: -fmt.Println("ChainEvent") fs.filterMu.RLock() for _, filter := range fs.chainFilters { -fmt.Println("1") if filter.BlockCallback != nil && !filter.created.After(event.Time) { -fmt.Println("2") filter.BlockCallback(ev.Block, ev.Logs) } } diff --git a/les/fetcher.go b/les/fetcher.go index f7595cc789..f8c997162d 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -159,8 +159,10 @@ fmt.Println("removePeer 1") } case <-time.After(hardRequestTimeout): + if !disableClientRemovePeer { fmt.Println("removePeer 2") - f.pm.removePeer(p.id) + f.pm.removePeer(p.id) + } f.reqMu.Lock() close(f.requested[reqID]) delete(f.requested, reqID) diff --git a/les/handler.go b/les/handler.go index 741d401efb..2e88f74f19 100644 --- a/les/handler.go +++ b/les/handler.go @@ -325,10 +325,9 @@ fmt.Println(" done") // main loop. handle incoming messages. for { -fmt.Println("handleMsg") if err := pm.handleMsg(p); err != nil { glog.V(logger.Debug).Infof("%v: message handling failed: %v", p, err) -fmt.Println(" err:", err) +fmt.Println("handleMsg err:", err) return err } }