forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

broadcast ChainHeadEvents, removed prints

Browse source
This commit is contained in:
zsfelfoldi 2016-06-26 12:59:13 +02:00
parent 78a077372c
commit 7400974273
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
les/handler.go
View file

@ -152,8 +152,6 @@ func NewProtocolManager(chainConfig *core.ChainConfig, lightSync bool, networkId
case manager.newPeerCh <- peer: case manager.newPeerCh <- peer:
manager.wg.Add(1) manager.wg.Add(1)
defer manager.wg.Done() defer manager.wg.Done()
fmt.Println("enter handler", p.ID())
defer fmt.Println("exit handler", p.ID())
return manager.handle(peer) return manager.handle(peer)
case <-manager.quitSync: case <-manager.quitSync:
return p2p.DiscQuitting return p2p.DiscQuitting
@ -274,13 +272,10 @@ func (pm *ProtocolManager) handle(p *peer) error {
// Execute the LES handshake // Execute the LES handshake
td, head, genesis := pm.blockchain.Status() td, head, genesis := pm.blockchain.Status()
headNum := core.GetBlockNumber(pm.chainDb, head) headNum := core.GetBlockNumber(pm.chainDb, head)
fmt.Println("handshake")
if err := p.Handshake(td, head, headNum, genesis, pm.server); err != nil { if err := p.Handshake(td, head, headNum, genesis, pm.server); err != nil {
glog.V(logger.Debug).Infof("%v: handshake failed: %v", p, err) glog.V(logger.Debug).Infof("%v: handshake failed: %v", p, err)
fmt.Println(" err:", err)
return err return err
} }
fmt.Println(" done")
if rw, ok := p.rw.(*meteredMsgReadWriter); ok { if rw, ok := p.rw.(*meteredMsgReadWriter); ok {
rw.Init(p.version) rw.Init(p.version)
} }
@ -385,7 +380,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
if err := msg.Decode(&req); err != nil { if err := msg.Decode(&req); err != nil {
return errResp(ErrDecode, "%v: %v", msg, err) return errResp(ErrDecode, "%v: %v", msg, err)
} }
fmt.Println("RECEIVED", req[0].Number, req[0].Hash, req[0].Td) //fmt.Println("RECEIVED", req[0].Number, req[0].Hash, req[0].Td)
for _, r := range req { for _, r := range req {
pm.fetcher.notify(p, r) pm.fetcher.notify(p, r)
} }
@ -777,18 +772,18 @@ func (self *ProtocolManager) NodeInfo() *eth.EthNodeInfo {
} }
func (pm *ProtocolManager) broadcastBlockLoop() { func (pm *ProtocolManager) broadcastBlockLoop() {
sub := pm.eventMux.Subscribe( core.ChainEvent{}) sub := pm.eventMux.Subscribe( core.ChainHeadEvent{})
go func() { go func() {
for { for {
select { select {
case ev := <-sub.Chan(): case ev := <-sub.Chan():
peers := pm.peers.AllPeers() peers := pm.peers.AllPeers()
if len(peers) > 0 { if len(peers) > 0 {
header := ev.Data.(core.ChainEvent).Block.Header() header := ev.Data.(core.ChainHeadEvent).Block.Header()
hash := header.Hash() hash := header.Hash()
number := header.Number.Uint64() number := header.Number.Uint64()
td := core.GetTd(pm.chainDb, hash, number) td := core.GetTd(pm.chainDb, hash, number)
fmt.Println("BROADCAST", number, hash, td) //fmt.Println("BROADCAST", number, hash, td)
announce := newBlockHashesData{{Hash: hash, Number: number, Td: td}} announce := newBlockHashesData{{Hash: hash, Number: number, Td: td}}
for _, p := range peers { for _, p := range peers {
p.SendNewBlockHashes(announce) p.SendNewBlockHashes(announce)