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

10
util/network-devp2p/src/service.rs
View File

@@ -20,7 +20,7 @@ use host::Host;
use io::*;
use parking_lot::RwLock;
use std::net::SocketAddr;
use std::ops::Range;
use std::ops::RangeInclusive;
use std::sync::Arc;
use ansi_term::Colour;
use network::ConnectionFilter;
@@ -95,12 +95,8 @@ impl NetworkService {
}
/// Returns the number of peers allowed.
///
/// Keep in mind that `range.end` is *exclusive*.
pub fn num_peers_range(&self) -> Range<u32> {
let start = self.config.min_peers;
let end = self.config.max_peers + 1;
start .. end
pub fn num_peers_range(&self) -> RangeInclusive<u32> {
self.config.min_peers..=self.config.max_peers
}
/// Returns external url if available.