diff options
| -rw-r--r-- | core/bloombits/matcher.go | 5 | ||||
| -rw-r--r-- | les/backend.go | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index a75f8c085..d38d4ba83 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 diff --git a/les/backend.go b/les/backend.go index 3a68d13eb..333df920e 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{} |