Merge #3459

3459: feat: upgrade tentacle r=driftluo a=driftluo ### What problem does this PR solve? introduce `async_trait` to ckb this is a break change for ckb, it upgrade tentacle from 0.4.0-aphla to 0.4.0 ckb-network will also use `async_trait` to ckb protocol [release note](https://github.com/nervosnetwork/tentacle/blob/master/CHANGELOG.md#040) ### Check List Tests - Unit test - Integration test ### Release note ```release-note None: Exclude this PR from the release note. ``` Co-authored-by: driftluo <driftluo@foxmail.com>
nervosnetwork · Jun 30, 2022 · 5819c75 · 5819c75
2 parents 685ebe5 + 9f8261e
commit 5819c75
Show file tree

Hide file tree

Showing 22 changed files with 722 additions and 328 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -33,8 +33,9 @@ ipnetwork = "0.18"
 serde_json = "1.0"
 bloom-filters = "0.1"
 ckb-spawn = { path = "../util/spawn", version = "= 0.104.0-pre" }
+socket2 = "0.4"
 
-p2p = { version="=0.4.0-alpha.4", package="tentacle", features = ["upnp", "parking_lot"] }
+p2p = { version="0.4.0", package="tentacle", features = ["upnp", "parking_lot"] }
 
 [features]
 with_sentry = ["sentry"]

diff --git a/network/src/lib.rs b/network/src/lib.rs
@@ -37,10 +37,11 @@ pub use crate::{
     },
 };
 pub use p2p::{
+    async_trait,
     builder::ServiceBuilder,
     bytes, multiaddr,
     secio::{PeerId, PublicKey},
-    service::{BlockingFlag, ServiceControl, SessionType, TargetProtocol, TargetSession},
+    service::{ServiceControl, SessionType, TargetProtocol, TargetSession},
     traits::ServiceProtocol,
     utils::{extract_peer_id, multiaddr_to_socketaddr},
     ProtocolId, SessionId,