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

Sync fixes and tweaks #1164

Merged
merged 5 commits into from May 30, 2016
Merged

Sync fixes and tweaks #1164

merged 5 commits into from May 30, 2016

Conversation

arkpar
Copy link
Collaborator

@arkpar arkpar commented May 27, 2016

Fixes #1159

@arkpar arkpar added the A0-pleasereview 🤓 Pull request needs code review. label May 27, 2016
peer.ask_time = time::precise_time_s();
}
let mut peer = self.peers.get_mut(&peer_id).unwrap();
peer.asking = asking;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Always set the asking status so that requested blocks would be unmarked as being downloaded on disconnect.

@gavofyork gavofyork added A8-looksgood 🦄 Pull request is reviewed well. A0-pleasereview 🤓 Pull request needs code review. A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. A8-looksgood 🦄 Pull request is reviewed well. labels May 27, 2016
@arkpar arkpar added A0-pleasereview 🤓 Pull request needs code review. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels May 27, 2016
@rphmeier rphmeier added the A8-looksgood 🦄 Pull request is reviewed well. label May 27, 2016
@gavofyork gavofyork removed the A0-pleasereview 🤓 Pull request needs code review. label May 27, 2016
@arkpar arkpar added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. and removed A8-looksgood 🦄 Pull request is reviewed well. labels May 28, 2016
@arkpar arkpar added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels May 28, 2016
@@ -159,7 +159,7 @@ fn propagate_hashes() {

#[test]
fn propagate_blocks() {
let mut net = TestNet::new(2);
let mut net = TestNet::new(20);
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't it also work for a small number of peers?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Now the NewHashes message is sent out first, than NewBlock to some of the remaining peers. So this test requires more peers

@NikVolf NikVolf added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels May 30, 2016
@arkpar arkpar merged commit 6d25e7f into master May 30, 2016
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.

None yet

4 participants