grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(ManageNetwork): replace Range with RangeInclusive (#10209)

Browse Source 
* fix(ManageNetwork): replace Range -> RangeIncls

Fixes `TODO: Range should be changed to RangeInclusive once stable (https://github.com/rust-lang/rust/pull/50758)`

* fix(tests)

* fix(grumbles): off-by-one error in debug_asserts

* RangeInclusive::end() is inclusive which means that if start and end is equal the `debug_assert(range.end() >
range.start()` will fail which is shouldn't
This commit is contained in:
Niklas Adolfsson
2019-01-22 09:51:40 +01:00
committed by GitHub
parent c35abe4196
commit 4b11d79829
5 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ethcore/sync/src/api.rs
View File

@@ -17,7 +17,7 @@
use std::sync::{Arc, mpsc, atomic};
use std::collections::{HashMap, BTreeMap};
use std::io;
use std::ops::Range;
use std::ops::RangeInclusive;
use std::time::Duration;
use bytes::Bytes;
use devp2p::NetworkService;
@@ -615,9 +615,7 @@ pub trait ManageNetwork : Send + Sync {
/// Stop network
fn stop_network(&self);
/// Returns the minimum and maximum peers.
/// Note that `range.end` is *exclusive*.
// TODO: Range should be changed to RangeInclusive once stable (https://github.com/rust-lang/rust/pull/50758)
fn num_peers_range(&self) -> Range<u32>;
fn num_peers_range(&self) -> RangeInclusive<u32>;
/// Get network context for protocol.
fn with_proto_context(&self, proto: ProtocolId, f: &mut FnMut(&NetworkContext));
}
@@ -656,7 +654,7 @@ impl ManageNetwork for EthSync {
self.stop();
}
fn num_peers_range(&self) -> Range<u32> {
fn num_peers_range(&self) -> RangeInclusive<u32> {
self.network.num_peers_range()
}
@@ -935,7 +933,7 @@ impl ManageNetwork for LightSync {
self.network.stop();
}
fn num_peers_range(&self) -> Range<u32> {
fn num_peers_range(&self) -> RangeInclusive<u32> {
self.network.num_peers_range()
}
@@ -948,12 +946,12 @@ impl LightSyncProvider for LightSync {
fn peer_numbers(&self) -> PeerNumbers {
let (connected, active) = self.proto.peer_count();
let peers_range = self.num_peers_range();
debug_assert!(peers_range.end > peers_range.start);
debug_assert!(peers_range.end() >= peers_range.start());
PeerNumbers {
connected: connected,
active: active,
max: peers_range.end as usize - 1,
min: peers_range.start as usize,
max: *peers_range.end() as usize,
min: *peers_range.start() as usize,
}
}