From f26761adbc7f682fd9a1307839871d2ba911d492 Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Thu, 28 Nov 2024 14:16:22 +0100
Subject: [PATCH] feat(iroh): make all important iroh_base types available

Otherwise one has to pull in some things from `iroh-base` and some from here
---
 iroh/src/endpoint.rs | 2 +-
 iroh/src/lib.rs      | 6 +++---
 iroh/src/ticket.rs   | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 iroh/src/ticket.rs

diff --git a/iroh/src/endpoint.rs b/iroh/src/endpoint.rs
index 036229e350..7764d01e1b 100644
--- a/iroh/src/endpoint.rs
+++ b/iroh/src/endpoint.rs
@@ -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,
diff --git a/iroh/src/lib.rs b/iroh/src/lib.rs
index 6318eac34e..5f6c68e714 100644
--- a/iroh/src/lib.rs
+++ b/iroh/src/lib.rs
@@ -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;
 
diff --git a/iroh/src/ticket.rs b/iroh/src/ticket.rs
deleted file mode 100644
index d4db5e4347..0000000000
--- a/iroh/src/ticket.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Tickets supported by iroh
-pub use iroh_base::ticket::{NodeTicket, Ticket};