From 2c77f33745b83711ca8e94bf63331eea56056d6b Mon Sep 17 00:00:00 2001 From: Zsolt Felfoldi Date: Fri, 27 Oct 2017 15:45:35 +0200 Subject: [PATCH 1/2] les: fix topic ID --- les/backend.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/les/backend.go b/les/backend.go index 3a68d13ebe77..333df920e0f3 100644 --- a/les/backend.go +++ b/les/backend.go @@ -145,7 +145,7 @@ func lesTopic(genesisHash common.Hash, protocolVersion uint) discv5.Topic { default: panic(nil) } - return discv5.Topic(name + common.Bytes2Hex(genesisHash.Bytes()[0:8])) + return discv5.Topic(name + "@" + common.Bytes2Hex(genesisHash.Bytes()[0:8])) } type LightDummyAPI struct{} From 2d8c1490f2b40e94e0b5f834366e1f377cd45187 Mon Sep 17 00:00:00 2001 From: Zsolt Felfoldi Date: Fri, 27 Oct 2017 15:53:44 +0200 Subject: [PATCH 2/2] core/bloombits: fix interface conversion --- core/bloombits/matcher.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index a75f8c085938..d38d4ba83e50 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -534,7 +534,10 @@ func (s *MatcherSession) Close() { // Error returns any failure encountered during the matching session. func (s *MatcherSession) Error() error { - return s.err.Load().(error) + if err := s.err.Load(); err != nil { + return err.(error) + } + return nil } // AllocateRetrieval assigns a bloom bit index to a client process that can either