Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Sync: Propagate uncles and fix status reporting #1134

Merged
merged 1 commit into from
May 24, 2016
Merged

Sync: Propagate uncles and fix status reporting #1134

merged 1 commit into from
May 24, 2016

Conversation

arkpar
Copy link
Collaborator

@arkpar arkpar commented May 24, 2016

Fixes #1110 and hopefully #1130

@arkpar arkpar added the A0-pleasereview 🤓 Pull request needs code review. label May 24, 2016
@gavofyork gavofyork added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels May 24, 2016
@@ -529,7 +534,7 @@ impl BlockChain {
let mut ret = Vec::new();
for a in self.ancestry_iter(parent.clone()).unwrap().skip(1).take(uncle_generations) {
ret.extend(self.block_details(&a).unwrap().children.iter()
.filter_map(|h| if excluded.contains(h) { None } else { self.block_header(h) })
.filter_map(|h| if excluded.contains(h) { None } else { Some(h) })
Copy link
Contributor

@rphmeier rphmeier May 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could this just be filter(|h| excluded.contains(h))?

@arkpar arkpar added A4-gotissues 💥 Pull request is reviewed and has significant issues which must be addressed. and removed A8-looksgood 🦄 Pull request is reviewed well. labels May 24, 2016
@arkpar arkpar added A0-pleasereview 🤓 Pull request needs code review. and removed A4-gotissues 💥 Pull request is reviewed and has significant issues which must be addressed. labels May 24, 2016
@debris debris added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels May 24, 2016
@gavofyork gavofyork merged commit fba5082 into master May 24, 2016
@gavofyork gavofyork deleted the sync branch May 24, 2016 19:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants