Skip to content

Commit

Permalink
refactor: extract net-tools (#2991)
Browse files Browse the repository at this point in the history
## Description

https://github.com/n0-computer/net-tools

Updates to newly published 

- `[email protected]`
- `[email protected]`

## Breaking Changes

<!-- Optional, if there are any breaking changes document them,
including how to migrate older code. -->

## Notes & open questions

<!-- Any notes, remarks or open questions you have to make about the PR.
-->

## Change checklist

- [ ] Self-review.
- [ ] Documentation updates following the [style
guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text),
if relevant.
- [ ] Tests if relevant.
- [ ] All breaking changes documented.
  • Loading branch information
dignifiedquire authored Dec 2, 2024
1 parent df591bc commit 574337a
Show file tree
Hide file tree
Showing 44 changed files with 14 additions and 7,488 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ jobs:
# uses: obi1kenobi/cargo-semver-checks-action@v2
uses: n0-computer/cargo-semver-checks-action@feat-baseline
with:
package: iroh, iroh-base, iroh-dns-server, iroh-net-bench, iroh-node-util, netwatch, portmapper, iroh-relay, iroh-net-report
package: iroh, iroh-base, iroh-dns-server, iroh-net-bench, iroh-node-util, iroh-relay, iroh-net-report
baseline-rev: ${{ env.HEAD_COMMIT_SHA }}
use-cache: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
RUSTFLAGS: -Dwarnings
RUSTDOCFLAGS: -Dwarnings
SCCACHE_CACHE_SIZE: "10G"
CRATES_LIST: "iroh,iroh-node-util,iroh-net-bench,iroh-test,iroh-dns-server,netwatch,portmapper,iroh-relay,iroh-net-report"
CRATES_LIST: "iroh,iroh-node-util,iroh-net-bench,iroh-test,iroh-dns-server,iroh-relay,iroh-net-report"
IROH_FORCE_STAGING_RELAYS: "1"

jobs:
Expand Down
43 changes: 6 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ members = [
"iroh-test",
"iroh/bench",
"iroh-relay",
"net-tools/netwatch",
"net-tools/portmapper",
"iroh-net-report",
"iroh-node-util",
]
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl ProtocolHandler for Echo {
Box::pin(async move {
let connection = connecting.await?;
let (mut send, mut recv) = connection.accept_bi().await?;

// Echo any bytes received back directly.
let bytes_sent = tokio::io::copy(&mut recv, &mut send).await?;

Expand Down Expand Up @@ -132,11 +132,9 @@ This repository contains a workspace of crates:
- `iroh`: The core library for hole-punching & communicating with relays.
- `iroh-relay`: The relay server implementation. This is the code we run in production (and you can, too!).
- `iroh-base`: Common types like `Hash`, key types or `RelayUrl`.
- `iroh-metrics`: Helper library for adding metrics support to crates.
- `iroh-test`: Test utilities.
- `iroh-dns-server`: DNS server implementation powering the `n0_discovery` for NodeIds, running at dns.iroh.link.
- `iroh-net-report`: Analyzes your host's networking ability & NAT.
- `net-tools/*`: Networking utility crates

## License

Expand Down Expand Up @@ -170,4 +168,4 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
[Iroh Experiments]: https://github.com/n0-computer/iroh-experiments
[echo-rs]: /iroh-router/examples/echo.rs
[iroh-perf]: https://perf.iroh.computer
[docs]: https://iroh.computer/docs
[docs]: https://iroh.computer/docs
4 changes: 2 additions & 2 deletions iroh-net-report/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ hickory-resolver = "=0.25.0-alpha.2"
iroh-base = { version = "0.28.0", path = "../iroh-base", default-features = false, features = ["relay"] }
iroh-metrics = { version = "0.28.0", default-features = false, optional = true }
iroh-relay = { version = "0.28", path = "../iroh-relay" }
netwatch = { version = "0.1.0", path = "../net-tools/netwatch" }
portmapper = { version = "0.1.0", path = "../net-tools/portmapper" }
netwatch = { version = "0.2.0" }
portmapper = { version = "0.2.0" }
rand = "0.8"
reqwest = { version = "0.12", default-features = false }
rustls = { version = "0.23", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions iroh/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ iroh-base = { version = "0.28.0", features = ["key"], path = "../iroh-base" }
iroh-relay = { version = "0.28", path = "../iroh-relay" }
libc = "0.2.139"
netdev = "0.31.0"
netwatch = { version = "0.1.0", path = "../net-tools/netwatch" }
netwatch = { version = "0.2.0" }
num_enum = "0.7"
once_cell = "1.18.0"
parking_lot = "0.12.1"
Expand All @@ -57,7 +57,7 @@ pkarr = { version = "2", default-features = false, features = [
"async",
"relay",
] }
portmapper = { version = "0.1.0", path = "../net-tools/portmapper" }
portmapper = { version = "0.2.0" }
postcard = { version = "1", default-features = false, features = [
"alloc",
"use-std",
Expand Down
76 changes: 0 additions & 76 deletions net-tools/netwatch/Cargo.toml

This file was deleted.

24 changes: 0 additions & 24 deletions net-tools/netwatch/README.md

This file was deleted.

Loading

0 comments on commit 574337a

Please sign in to comment.