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

Merge fix

Browse source
This commit is contained in:
Frank Szendzielarz 2019-06-04 10:48:13 +02:00
parent 84a9c8ba82
commit 1d54b11b85
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
les/protocol.go
View file

@ -42,17 +42,8 @@ var (
AdvertiseProtocolVersions = []uint{lpv2} // clients are searching for the first advertised protocol in the list AdvertiseProtocolVersions = []uint{lpv2} // clients are searching for the first advertised protocol in the list
) )
<<<<<<< HEAD // ProtocolLengths is the number of implemented message corresponding to different protocol versions.
// Number of implemented message corresponding to different protocol versions.
var ProtocolLengths = map[uint]uint64{lpv2: 22, lpv3: 24} var ProtocolLengths = map[uint]uint64{lpv2: 22, lpv3: 24}
=======
// ProtocolLengths - Number of implemented message corresponding to different protocol versions.
<<<<<<< HEAD
var ProtocolLengths = map[uint]uint64{lpv2: 22}
>>>>>>> Further LES cleanup
=======
var ProtocolLengths = map[uint]uint64{lpv2: 22, lpv3: 24}
>>>>>>> resolving conflicts
const ( const (
// NetworkID - the network id // NetworkID - the network id

12
les/server.go
View file

@ -39,10 +39,6 @@ import (
const bufLimitRatio = 6000 // fixed bufLimit/MRR ratio const bufLimitRatio = 6000 // fixed bufLimit/MRR ratio
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> resolving conflicts
const ( const (
logFileName = "" // csv log file name (disabled if empty) logFileName = "" // csv log file name (disabled if empty)
logClientPoolMetrics = true // log client pool metrics logClientPoolMetrics = true // log client pool metrics
@ -52,12 +48,7 @@ const (
logProtocolHandler = true // log protocol handler events logProtocolHandler = true // log protocol handler events
) )
<<<<<<< HEAD
=======
=======
>>>>>>> resolving conflicts
// LesServer is a node service running a LES server // LesServer is a node service running a LES server
>>>>>>> Correcting documentation format
type LesServer struct { type LesServer struct {
lesCommons lesCommons
@ -310,10 +301,7 @@ func (s *LesServer) SetBloomBitsIndexer(bloomIndexer *core.ChainIndexer) {
func (s *LesServer) Stop() error { func (s *LesServer) Stop() error {
s.fcManager.Stop() s.fcManager.Stop()
s.chtIndexer.Close() s.chtIndexer.Close()
<<<<<<< HEAD
=======
>>>>>>> resolving conflicts
// bloom trie indexer is closed by parent bloombits indexer // bloom trie indexer is closed by parent bloombits indexer
go func() { go func() {
<-s.protocolManager.noMorePeers <-s.protocolManager.noMorePeers