Network crate cleanups (#3049)

* Remove useless internal messages

* Remove NetworkService::disconnect_peer

* Remove NetworkMsg altogether

* Rename ProtocolMsg ServerToWorkerMsg

* Remove useless code

* Add example for parse_str_addr

* Move parse_str_addr and ProtocolId to config

* Don't reexport the content of config

* Rework the imports

* More reexports rework

* Add documentation

* Move finalization report to network future

* Move on_block_imported to worker

* get_value/put_value no longer locking

* local_peer_id() no longer locks

* Remove FetchFuture

* Service imports cleanup

* Produce the network state in the network task

* Merge network task and RPC network task

* Move network methods to NetworkWorker

* Remove Arc peers system from network

* add_reserved_peer now goes through the channel

* Remove Mutex around network swarm

* Remove the FnOnce alias traits

* Replace is_offline with num_connected

* Improve style of poll()

* Fix network tests

* Some doc in service module

* Remove macro export

* Minor doc changes

* Remove the synchronized() method of the import queue

* Line width

* Line widths

* Fix import queue tests

* Fix CLI tests
This commit is contained in:
Pierre Krieger
2019-07-08 15:33:29 +02:00
committed by Gavin Wood
parent 7df8e52cfe
commit 1e126eab2f
24 changed files with 598 additions and 814 deletions
+5 -5
View File
@@ -34,7 +34,7 @@ use service::{
Roles,
FactoryExtrinsic,
};
use network::{multiaddr, Multiaddr, ManageNetwork};
use network::{multiaddr, Multiaddr};
use network::config::{NetworkConfiguration, TransportConfig, NodeKeyConfig, Secret, NonReservedPeerMode};
use sr_primitives::generic::BlockId;
use consensus::{ImportBlock, BlockImport};
@@ -301,9 +301,9 @@ pub fn connectivity<F: ServiceFactory>(spec: FactoryChainSpec<F>) where
service.get().network().add_reserved_peer(first_address.to_string()).expect("Error adding reserved peer");
}
network.run_until_all_full(
|_index, service| service.get().network().peers_debug_info().len() == NUM_FULL_NODES - 1
|_index, service| service.get().network().num_connected() == NUM_FULL_NODES - 1
+ NUM_LIGHT_NODES,
|_index, service| service.get().network().peers_debug_info().len() == NUM_FULL_NODES,
|_index, service| service.get().network().num_connected() == NUM_FULL_NODES,
);
network.runtime
};
@@ -340,9 +340,9 @@ pub fn connectivity<F: ServiceFactory>(spec: FactoryChainSpec<F>) where
}
}
network.run_until_all_full(
|_index, service| service.get().network().peers_debug_info().len() == NUM_FULL_NODES - 1
|_index, service| service.get().network().num_connected() == NUM_FULL_NODES - 1
+ NUM_LIGHT_NODES,
|_index, service| service.get().network().peers_debug_info().len() == NUM_FULL_NODES,
|_index, service| service.get().network().num_connected() == NUM_FULL_NODES,
);
}
temp.close().expect("Error removing temp dir");