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

Filter-out nodes.json #7716

Merged
merged 6 commits into from
Jan 31, 2018
Merged

Filter-out nodes.json #7716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6dd6919
Filter-out nodes.json
tomusdrw Jan 29, 2018
f9f3410
network: sort node table nodes by failure ratio
andresilva Jan 29, 2018
95848ad
network: fix node table tests
andresilva Jan 29, 2018
dede52f
network: fit node failure percentage into buckets of 5%
andresilva Jan 30, 2018
de5c75e
network: consider number of attempts in sorting of node table
andresilva Jan 30, 2018
11d5d15
network: fix node table grumbles
andresilva Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions util/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ ethcore-logger = { path ="../../logger" }
ipnetwork = "0.12.6"
keccak-hash = { path = "../hash" }
snappy = { git = "https://github.com/paritytech/rust-snappy" }
serde = "1.0"
serde_json = "1.0"
serde_derive = "1.0"
error-chain = { version = "0.11", default-features = false }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions util/network/src/host.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ impl Host {
let address = {
let mut nodes = self.nodes.write();
if let Some(node) = nodes.get_mut(id) {
node.last_attempted = Some(::time::now());
node.attempts += 1;
node.endpoint.address
}
else {
Expand All @@ -738,6 +738,7 @@ impl Host {
}
}
};

if let Err(e) = self.create_connection(socket, Some(id), io) {
debug!(target: "network", "Can't create connection: {:?}", e);
}
Expand Down Expand Up @@ -1281,4 +1282,3 @@ fn host_client_url() {
let host: Host = Host::new(config, Arc::new(NetworkStats::new()), None).unwrap();
assert!(host.local_url().starts_with("enode://101b3ef5a4ea7a1c7928e24c4c75fd053c235d7b80c22ae5c03d145d0ac7396e2a4ffff9adee3133a7b05044a5cee08115fd65145e5165d646bde371010d803c@"));
}

5 changes: 3 additions & 2 deletions util/network/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,16 @@ extern crate path;
extern crate ethcore_logger;
extern crate ipnetwork;
extern crate keccak_hash as hash;
extern crate serde;
extern crate serde_json;
extern crate snappy;

#[macro_use]
extern crate error_chain;

#[macro_use]
extern crate log;
#[macro_use]
extern crate serde_derive;

#[cfg(test)]
extern crate tempdir;
Expand Down Expand Up @@ -207,4 +209,3 @@ pub enum AllowIP {
/// Block all addresses
None,
}

Loading