Transport initialization updates #585

pavel-kokolemin · 2022-12-07T15:32:50Z

This is continuation of this discussion:
#571 (comment)

New associated type (Transport) is added to NetworkingService trait.
Now when a P2P subsystem is created a transport object is required.
For Libp2pService it's transport::Boxed<(PeerId, StreamMuxerBox)> from libp2p (with some auxiliary key details).
For MockService it's actual TransportSocket trait implementation.

I added new make_transport function to the MakeTestAddress trait to be able to create new transport in tests.

There was a problem with circular dev dependency when I tried to use updated MakeTestAddress from unit tests.
It because p2p unit tests are refering p2p-test-utils, while p2p-test-utils is referring p2p itself.
Rust does not allow build cycles so p2p is compiled twice, once with the test flag enabled and once without, making two unrelated artifacts.
And because MakeTestAddress was returning two different types (from "p2p as lib" and "p2p as test lib") compilation failed.
Here is an example of such an error: rust-lang/cargo#6765
As a workaround I moved MakeTestAddress to p2p sources.
Perhaps the proper fix would be to move unit tests from p2p to backend-test-suite instead.

p2p/src/lib.rs

p2p/src/net/libp2p/mod.rs

p2p/src/net/mod.rs

p2p/src/testing_utils.rs

node/src/runner.rs

TheQuantumPhysicist

Looking good. Please address the few issues I mentioned then we can merge.

p2p/src/lib.rs

Fix problem with different noise keys used in bind and connect.

Add make_transport() to MakeTestAddress trait Move MakeTestAddress from p2p-test-utils to p2p to break circular dev dependency Replace most TransportSocket::new calls with MakeTestAddress::make_transport()

p2p/src/testing_utils.rs

pavel-kokolemin requested review from muursh, erubboli, iljakuklic, TheQuantumPhysicist and stanislav-tkach as code owners December 7, 2022 15:32

iljakuklic reviewed Dec 7, 2022

View reviewed changes

p2p/src/lib.rs Show resolved Hide resolved