Refactor the crate to use stable futures

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Next Version
+
+- Use varints instead of fixed sized (4 byte) integers to delimit plaintext 2.0 messages to align implementation with the specification.
+
 # Version 0.13.2 (2020-01-02)
 
 - Fixed the `libp2p-noise` handshake not flushing the underlying stream before waiting for a response.

Cargo.toml

@@ -14,8 +14,8 @@ default = ["secp256k1", "libp2p-websocket"]
 secp256k1 = ["libp2p-core/secp256k1", "libp2p-secio/secp256k1"]
 
 [dependencies]
-bytes = "0.4"
-futures = "0.1"
+bytes = "0.5"
+futures = "0.3.1"
 multiaddr = { package = "parity-multiaddr", version = "0.6.0", path = "misc/multiaddr" }
 multihash = { package = "parity-multihash", version = "0.2.0", path = "misc/multihash" }
 lazy_static = "1.2"
@@ -33,11 +33,8 @@ libp2p-uds = { version = "0.13.0", path = "transports/uds" }
 libp2p-wasm-ext = { version = "0.6.0", path = "transports/wasm-ext" }
 libp2p-yamux = { version = "0.13.0", path = "muxers/yamux" }
 parking_lot = "0.9.0"
-smallvec = "0.6"
-tokio-codec = "0.1"
-tokio-executor = "0.1"
-tokio-io = "0.1"
-wasm-timer = "0.1"
+smallvec = "1.0"
+wasm-timer = "0.2.4"
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "unknown")))'.dependencies]
 libp2p-deflate = { version = "0.5.0", path = "protocols/deflate" }
@@ -48,9 +45,8 @@ libp2p-tcp = { version = "0.13.0", path = "transports/tcp" }
 libp2p-websocket = { version = "0.13.0", path = "transports/websocket", optional = true }
 
 [dev-dependencies]
+async-std = "1.0"
 env_logger = "0.7.1"
-tokio = "0.1"
-tokio-stdin-stdout = "0.1"
 
 [workspace]
 members = [
@@ -78,3 +74,4 @@ members = [
     "transports/websocket",
     "transports/wasm-ext"
 ]
+

core/Cargo.toml

@@ -12,28 +12,27 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 asn1_der = "0.6.1"
 bs58 = "0.3.0"
-bytes = "0.4"
+bytes = "0.5"
 ed25519-dalek = "1.0.0-pre.3"
 failure = "0.1"
 fnv = "1.0"
+futures = { version = "0.3.1", features = ["compat", "io-compat", "executor", "thread-pool"] }
+futures-timer = "2"
 lazy_static = "1.2"
+libsecp256k1 = { version = "0.3.1", optional = true }
 log = "0.4"
 multiaddr = { package = "parity-multiaddr", version = "0.6.0", path = "../misc/multiaddr" }
 multihash = { package = "parity-multihash", version = "0.2.0", path = "../misc/multihash" }
 multistream-select = { version = "0.6.0", path = "../misc/multistream-select" }
-futures = "0.1"
 parking_lot = "0.9.0"
+pin-project = "0.4.6"
 protobuf = "=2.8.1" # note: see https://github.com/libp2p/rust-libp2p/issues/1363
 quick-error = "1.2"
 rand = "0.7"
 rw-stream-sink = { version = "0.1.1", path = "../misc/rw-stream-sink" }
-libsecp256k1 = { version = "0.3.1", optional = true }
 sha2 = "0.8.0"
-smallvec = "0.6"
-tokio-executor = "0.1.4"
-tokio-io = "0.1"
-wasm-timer = "0.1"
-unsigned-varint = "0.2"
+smallvec = "1.0"
+unsigned-varint = "0.3"
 void = "1"
 zeroize = "1"
 
@@ -42,16 +41,14 @@ ring = { version = "0.16.9", features = ["alloc", "std"], default-features = fal
 untrusted = "0.7.0"
 
 [dev-dependencies]
-libp2p-swarm = { version = "0.3.0", path = "../swarm" }
-libp2p-tcp = { version = "0.13.0", path = "../transports/tcp" }
+assert_matches = "1.3"
+async-std = "1.0"
 libp2p-mplex = { version = "0.13.0", path = "../muxers/mplex" }
 libp2p-secio = { version = "0.13.0", path = "../protocols/secio" }
-rand = "0.7.2"
+libp2p-swarm = { version = "0.3.0", path = "../swarm" }
+libp2p-tcp = { version = "0.13.0", path = "../transports/tcp" }
 quickcheck = "0.9.0"
-tokio = "0.1"
-wasm-timer = "0.1"
-assert_matches = "1.3"
-tokio-mock-task = "0.1"
+wasm-timer = "0.2"
 
 [features]
 default = ["secp256k1"]