Merge remote-tracking branch 'upstream/master' into dp/fix/substream-…

…ref-debug-impl

* upstream/master:
  Use paritytech/rust-secp256k1 (libp2p#598)
  Use websocket 0.21.0 (libp2p#597)
  Reexport multihash from the facade (libp2p#587)
  Add substrate to the list of projects using libp2p (libp2p#595)
  Remove spaces before semicolons (libp2p#591)
  Add protocol to report external address view. (libp2p#566)
  Add a TransportExt trait (libp2p#533)
  libp2p#399 remove tokio_current_thread tests (libp2p#577)
  Remove even more unused files (libp2p#581)
  Fix the polling process in handled node (libp2p#582)
  Fix panicking when Kad responder is destroyed (libp2p#575)
  Remove other unused files (libp2p#570)
  Fix panic in raw swarm (libp2p#571)
  Remove two unused files (libp2p#567)
  New core (libp2p#568)
  Remove the old API (libp2p#565)
  Change some `nat_traversal`s to consider a prefix. (libp2p#550)
  Add some documentation to listeners stream (libp2p#547)
  Add shutdown functionality to `NodeStream`. (libp2p#560)

.circleci/config.yml

@@ -105,10 +105,6 @@ jobs:
       - checkout
       - restore_cache:
           key: integration-test-cache
-      - run:
-          command: cargo run --example ping-client -- /ip4/127.0.0.1/tcp/4001
-      - run:
-          command: cargo run --example echo-dialer -- /ip4/127.0.0.1/tcp/10333
       - save_cache:
           key: integration-test-cache
           paths:

Cargo.toml

@@ -13,6 +13,7 @@ secio-secp256k1 = ["libp2p-secio/secp256k1"]
 bytes = "0.4"
 futures = "0.1"
 multiaddr = { path = "./misc/multiaddr" }
+multihash = { path = "./misc/multihash" }
 libp2p-mplex = { path = "./muxers/mplex" }
 libp2p-identify = { path = "./protocols/identify" }
 libp2p-kad = { path = "./protocols/kad" }
@@ -28,6 +29,7 @@ libp2p-uds = { path = "./transports/uds" }
 libp2p-websocket = { path = "./transports/websocket" }
 libp2p-yamux = { path = "./muxers/yamux" }
 tokio-codec = "0.1"
+tokio-executor = "0.1"
 tokio-io = "0.1"
 
 [target.'cfg(not(target_os = "emscripten"))'.dependencies]
@@ -43,32 +45,10 @@ bigint = "4.2"
 env_logger = "0.5.4"
 rand = "0.4"
 structopt =  "0.2"
-tokio-current-thread = "0.1"
+tokio = "0.1"
 tokio-io = "0.1"
 tokio-stdin = "0.1"
 
-[[example]]
-name = "echo-dialer"
-
-[[example]]
-name = "echo-server"
-
-[[example]]
-name = "floodsub"
-
-[[example]]
-name = "kademlia"
-
-[[example]]
-name = "ping-client"
-
-[[example]]
-name = "random_peerid"
-
-[[example]]
-name = "relay"
-
-
 [workspace]
 members = [
     "core",
@@ -81,6 +61,7 @@ members = [
     "protocols/identify",
     "protocols/kad",
     "protocols/ping",
+    "protocols/observed",
     "transports/relay",
     "protocols/secio",
     "muxers/mplex",

README.md

@@ -22,3 +22,4 @@ libp2p = { git = "https://github.com/libp2p/rust-libp2p" }
 (open a pull request if you want your project to be added here)
 
 - https://github.com/paritytech/polkadot
+- https://github.com/paritytech/substrate

core/Cargo.toml

@@ -29,7 +29,6 @@ libp2p-mplex = { path = "../muxers/mplex" }
 rand = "0.5"
 tokio = "0.1"
 tokio-codec = "0.1"
-tokio-current-thread = "0.1"
 tokio-timer = "0.2"
 assert_matches = "1.3"
 tokio-mock-task = "0.1"