Skip to content

Commit

Permalink
feat(iroh): make all important iroh_base types available (#2975)
Browse files Browse the repository at this point in the history
## Description

Otherwise one has to pull in some things from `iroh-base` and some from
here

## Breaking Changes

None, just additions

## 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 Nov 28, 2024
1 parent 7057d72 commit 73c9b75
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion iroh/src/endpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ use crate::{
mod rtt_actor;

pub use bytes::Bytes;
pub use iroh_base::node_addr::{AddrInfo, NodeAddr};
pub use iroh_base::node_addr::{AddrInfo, AddrInfoOptions, NodeAddr};
// Missing still: SendDatagram and ConnectionClose::frame_type's Type.
pub use quinn::{
AcceptBi, AcceptUni, AckFrequencyConfig, ApplicationClose, Chunk, ClosedStream, Connection,
Expand Down
6 changes: 3 additions & 3 deletions iroh/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,16 +242,16 @@ pub mod endpoint;
mod magicsock;
pub mod metrics;
pub mod protocol;
pub mod ticket;
pub mod tls;

pub(crate) mod util;

pub use endpoint::{AddrInfo, Endpoint, NodeAddr, RelayMode};
pub use endpoint::{AddrInfo, AddrInfoOptions, Endpoint, NodeAddr, RelayMode};
pub use iroh_base::{
key,
hash, key,
key::NodeId,
relay_map::{RelayMap, RelayNode, RelayUrl},
ticket,
};
pub use iroh_relay as relay;

Expand Down
2 changes: 0 additions & 2 deletions iroh/src/ticket.rs

This file was deleted.

0 comments on commit 73c9b75

Please sign in to comment.