cleanup

n0-computer · Jun 3, 2024 · 569d9f9 · 569d9f9
1 parent 3223677
commit 569d9f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/iroh-willow/src/actor.rs b/iroh-willow/src/actor.rs
@@ -15,7 +15,7 @@ use crate::{
         meadowcap,
         willow::{AuthorisedEntry, Entry, WriteCapability},
     },
-    session::{Channels, Error, Role, Session, SessionInit},
+    session::{Channels, Error, Role, Session, SessionId, SessionInit},
     store::{
         traits::{EntryReader, SecretStorage, Storage},
         Origin, Store,
@@ -25,8 +25,6 @@ use crate::{
 
 pub const INBOX_CAP: usize = 1024;
 
-pub type SessionId = u64;
-
 #[derive(Debug, Clone)]
 pub struct ActorHandle {
     tx: flume::Sender<ToActor>,

diff --git a/iroh-willow/src/session.rs b/iroh-willow/src/session.rs
@@ -18,6 +18,8 @@ pub use self::channels::Channels;
 pub use self::error::Error;
 pub use self::state::Session;
 
+pub type SessionId = u64;
+
 /// Data from the initial transmission
 ///
 /// This happens before the session is initialized.

diff --git a/iroh-willow/src/session/state.rs b/iroh-willow/src/session/state.rs
@@ -11,7 +11,6 @@ use futures_lite::Stream;
 use tracing::{Instrument, Span};
 
 use crate::{
-    actor::SessionId,
     net::InitialTransmission,
     proto::{
         challenge::ChallengeState,
@@ -30,6 +29,7 @@ use crate::{
 };
 
 use super::{
+    SessionId,
     channels::ChannelSenders,
     resource::{ResourceMap, ResourceMaps},
     AreaOfInterestIntersection, Error, Role, Scope, SessionMode,

diff --git a/iroh-willow/src/store.rs b/iroh-willow/src/store.rs
@@ -5,7 +5,7 @@ use std::{
 use tokio::sync::broadcast;
 
 use crate::{
-    actor::SessionId,
+    session::SessionId,
     proto::{
         grouping::Area,
         willow::{AuthorisedEntry, NamespaceId},