Skip to content

les, core/bloombits: trivial post-LES/2 fixes #15391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karalabe merged 2 commits into from
Oct 27, 2017
Merged

les, core/bloombits: trivial post-LES/2 fixes #15391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c77f33
les: fix topic ID
zsfelfoldi Oct 27, 2017
2d8c149
core/bloombits: fix interface conversion
zsfelfoldi Oct 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion core/bloombits/matcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion les/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down