pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-28 14:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further fix for common block update (#4071)

Browse Source
This commit is contained in:
Arkadiy Paronyan
2019-11-09 15:46:43 +01:00
committed by Gavin Wood
parent f90fd34f81
commit 9defa6a281
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/network/src/protocol/sync.rs
+6 -4
View File
@@ -1047,10 +1047,12 @@ impl<B: BlockT> ChainSync<B> {
}
// If the announced block is the best they have seen, our common number
// is either one further ahead or it's the one they just announced, if we know about it.
if known && is_best {
peer.common_number = number
} else if header.parent_hash() == &self.best_queued_hash || known_parent {
peer.common_number = number - One::one();
if is_best {
if known {
peer.common_number = number
} else if header.parent_hash() == &self.best_queued_hash || known_parent {
peer.common_number = number - One::one();
}
}
self.is_idle = false;
substrate/core/network/src/test/sync.rs
+10 -1
View File
@@ -640,7 +640,8 @@ fn does_not_sync_announced_old_best_block() {
let mut net = TestNet::new(3);
let old_hash = net.peer(0).push_blocks(1, false);
net.peer(0).push_blocks(19, true);
let old_hash_with_parent = net.peer(0).push_blocks(1, false);
net.peer(0).push_blocks(18, true);
net.peer(1).push_blocks(20, true);
net.peer(0).announce_block(old_hash, Vec::new());
@@ -650,4 +651,12 @@ fn does_not_sync_announced_old_best_block() {
Ok(Async::Ready(()))
})).unwrap();
assert!(!net.peer(1).is_major_syncing());
net.peer(0).announce_block(old_hash_with_parent, Vec::new());
runtime.block_on(futures::future::poll_fn::<(), (), _>(|| -> Result<_, ()> {
// poll once to import announcement
net.poll();
Ok(Async::Ready(()))
})).unwrap();
assert!(!net.peer(1).is_major_syncing());
}