Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into dp/chore/test-cor…
Browse files Browse the repository at this point in the history
…e-handled_node

* upstream/master:
  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)
  Shut down yamux and fix mplex shutdown. (libp2p#559)
  • Loading branch information
dvdplm committed Oct 16, 2018
2 parents a5205dd + 724d0f5 commit a9baffe
Show file tree
Hide file tree
Showing 28 changed files with 309 additions and 2,666 deletions.
4 changes: 0 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
22 changes: 0 additions & 22 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,6 @@ tokio-current-thread = "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",
Expand Down
Loading

0 comments on commit a9baffe

Please sign in to comment.