Get rid of libp2p dependency in sc-authority-discovery
#5842
Conversation
Co-authored-by: Bastian Köcher <[email protected]>
This reverts commit 73860e6.
|
@dmitry-markin , what about |
|
bot fmt |
|
@dmitry-markin https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7724737 was started for your command Comment |
|
@dmitry-markin Command |
Nothing wrong with this. This line means we are importing libp2p bitswap protocol implementation from litep2p. |
| @@ -1455,17 +1455,17 @@ where | |||
| fn handle_worker_message(&mut self, msg: ServiceToWorkerMsg) { | |||
| match msg { | |||
| ServiceToWorkerMsg::GetValue(key) => | |||
| self.network_service.behaviour_mut().get_value(key), | |||
| self.network_service.behaviour_mut().get_value(key.to_vec().into()), | |||
There was a problem hiding this comment.
Why not just key.into() here and below?
There was a problem hiding this comment.
I would say that it's because service.rs in general, and network_service in particular, are still dependant on libp2p.
| @@ -864,7 +864,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac | |||
| ); | |||
|
|
|||
| self.event_streams.send(Event::Dht( | |||
| DhtEvent::ValuePut(libp2p::kad::RecordKey::new(&key)) | |||
| DhtEvent::ValuePut(sc_network_types::kad::Key::new(&key.to_vec())) | |||
There was a problem hiding this comment.
Won't the following work to avoid copying?
| DhtEvent::ValuePut(sc_network_types::kad::Key::new(&key.to_vec())) | |
| DhtEvent::ValuePut(sc_network_types::kad::Key::from(key.to_vec())) |
Also below.
There was a problem hiding this comment.
Even better: we can implement From for sc_network_types::kad::Key to convert it directly from litep2p key, and then the line will become:
DhtEvent::ValuePut(key.into())
There was a problem hiding this comment.
Even better: we can implement
Fromforsc_network_types::kad::Keyto convert it directly from litep2p key, and then the line will become:DhtEvent::ValuePut(key.into())
From was already implemented for sc_network_types::kad::Key 😃 so now we have DhtEvent::ValuePut(key.into()). I'm guessing the task in the next issue, will be to remove libp2p from behaviour.rs and service.rs ? 👀
There was a problem hiding this comment.
I'm not entirely sure we can remove libp2p from behavior.rs and service.rs since they are specific to libp2p architecture (they implement the behavior and work with swarm events)
|
Good to merge? 👀 |
Let me have a look why zombienet tests are failing. |
Issue
#4859
Description
This PR removes
libp2ptypes in authority-discovery, and replace them with network backend agnostic types fromsc-network-types.The
sc-networkinterface is therefore updated accordingly.