Update substrate (#970)

* update substrate

* Hopefully fix compilation

* network: rename roles to role

* runtime: fix runtime-benchmarks compilation

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
This commit is contained in:
André Silva
2020-04-03 19:50:34 +01:00
committed by GitHub
parent 189c542655
commit b3d326acca
10 changed files with 140 additions and 132 deletions
+2 -2
View File
@@ -891,8 +891,8 @@ impl<Api, Sp, Gossip> Worker<Api, Sp, Gossip> where
fn handle_service_message(&mut self, message: ServiceToWorkerMsg) {
match message {
ServiceToWorkerMsg::PeerConnected(remote, roles) => {
self.protocol_handler.on_connect(remote, roles);
ServiceToWorkerMsg::PeerConnected(remote, role) => {
self.protocol_handler.on_connect(remote, role);
}
ServiceToWorkerMsg::PeerDisconnected(remote) => {
self.protocol_handler.on_disconnect(remote);
+3 -3
View File
@@ -189,8 +189,8 @@ sp_api::mock_impl_runtime_apis! {
}
impl super::Service<MockNetworkOps> {
async fn connect_peer(&mut self, peer: PeerId, roles: ObservedRole) {
self.sender.send(ServiceToWorkerMsg::PeerConnected(peer, roles)).await.unwrap();
async fn connect_peer(&mut self, peer: PeerId, role: ObservedRole) {
self.sender.send(ServiceToWorkerMsg::PeerConnected(peer, role)).await.unwrap();
}
async fn peer_message(&mut self, peer: PeerId, message: Message) {
@@ -591,7 +591,7 @@ fn validator_sends_key_to_collator_on_status() {
pool.spawner().spawn_local(worker_task).unwrap();
pool.run_until(async move {
service_clone.synchronize(move |proto| { proto.local_keys.insert(validator_id_clone); }).await;
service_clone.connect_peer(peer_clone.clone(), Roles::AUTHORITY).await;
service_clone.connect_peer(peer_clone.clone(), ObservedRole::Authority).await;
service_clone.peer_message(peer_clone.clone(), Message::Status(Status {
version: VERSION,
collating_for: Some((collator_id, para_id)),