diff options
Diffstat (limited to 'crates/tor-proto/src/channel')
| -rw-r--r-- | crates/tor-proto/src/channel/reactor.rs | 2 | ||||
| -rw-r--r-- | crates/tor-proto/src/channel/unique_id.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/tor-proto/src/channel/reactor.rs b/crates/tor-proto/src/channel/reactor.rs index f618fa5d4..5e7ccdb7b 100644 --- a/crates/tor-proto/src/channel/reactor.rs +++ b/crates/tor-proto/src/channel/reactor.rs @@ -71,7 +71,7 @@ pub enum CtrlMsg { /// Channel to send other messages from this circuit down. sender: CircuitRxSender, /// Oneshot channel to send the new circuit's identifiers down. - tx: ReactorResultChannel<(CircId, crate::client::circuit::UniqId)>, + tx: ReactorResultChannel<(CircId, crate::circuit::UniqId)>, }, /// Enable/disable/reconfigure channel padding /// diff --git a/crates/tor-proto/src/channel/unique_id.rs b/crates/tor-proto/src/channel/unique_id.rs index 307d240bb..5d1fbfdfd 100644 --- a/crates/tor-proto/src/channel/unique_id.rs +++ b/crates/tor-proto/src/channel/unique_id.rs @@ -48,14 +48,14 @@ impl CircUniqIdContext { CircUniqIdContext { next_circ_id: 0 } } /// Construct a new, unique-ish circuit UniqId - pub(super) fn next(&mut self, unique_id: UniqId) -> crate::client::circuit::UniqId { + pub(super) fn next(&mut self, unique_id: UniqId) -> crate::circuit::UniqId { let circ_unique_id = self.next_circ_id; self.next_circ_id += 1; assert!( self.next_circ_id != 0, "Exhausted the unique circuit ID namespace on a channel" ); - crate::client::circuit::UniqId::new(unique_id.0, circ_unique_id) + crate::circuit::UniqId::new(unique_id.0, circ_unique_id) } } |