pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 02:21:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Light client integration tests (#2638)

Browse Source 
* add light nodes to test_sync && test_consensus

* forbid light2light connections

* add light nodes to test_connectivity

* fixed light2light connection penalty

* post-merge fixes

* remove best_queued from Client info
This commit is contained in:
Svyatoslav Nikolsky
2019-06-05 18:14:42 +03:00
committed by Gavin Wood
parent 67bdfc7d8e
commit fc7548ce27
4 changed files with 138 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/network/src/protocol.rs
+11 -2
View File
@@ -845,13 +845,22 @@ impl<B: BlockT, S: NetworkSpecialization<B>, H: ExHashT> Protocol<B, S, H> {
network_out.disconnect_peer(who);
return;
}
if self.config.roles.is_light() {
// we're not interested in light peers
if status.roles.is_light() {
debug!(target: "sync", "Peer {} is unable to serve light requests", who);
network_out.report_peer(who.clone(), i32::min_value());
network_out.disconnect_peer(who);
return;
}
// we don't interested in peers that are far behind us
let self_best_block = self
.context_data
.chain
.info()
.best_queued_number
.unwrap_or_else(|| Zero::zero());
.chain.best_number;
let blocks_difference = self_best_block
.checked_sub(&status.best_number)
.unwrap_or_else(Zero::zero)
substrate/core/network/src/sync.rs
+4 -4
View File
@@ -191,8 +191,8 @@ impl<B: BlockT> ChainSync<B> {
_genesis_hash: info.chain.genesis_hash,
peers: HashMap::new(),
blocks: BlockCollection::new(),
best_queued_hash: info.best_queued_hash.unwrap_or(info.chain.best_hash),
best_queued_number: info.best_queued_number.unwrap_or(info.chain.best_number),
best_queued_hash: info.chain.best_hash,
best_queued_number: info.chain.best_number,
extra_requests: ExtraRequestsAggregator::new(),
role,
required_block_attributes,
@@ -852,8 +852,8 @@ impl<B: BlockT> ChainSync<B> {
self.best_importing_number = Zero::zero();
self.blocks.clear();
let info = protocol.client().info();
self.best_queued_hash = info.best_queued_hash.unwrap_or(info.chain.best_hash);
self.best_queued_number = info.best_queued_number.unwrap_or(info.chain.best_number);
self.best_queued_hash = info.chain.best_hash;
self.best_queued_number = info.chain.best_number;
debug!(target:"sync", "Restarted with {} ({})", self.best_queued_number, self.best_queued_hash);
let ids: Vec<PeerId> = self.peers.drain().map(|(id, _)| id).collect();
for id in ids {