From 7d4a57d5fa1a500f074835ecb0d8b204bc99d012 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Feb 2022 15:38:13 -0500
Subject: [PATCH] Rename TorConnectionFailed to TorAccessFailed

---
 crates/tor-chanmgr/src/err.rs | 4 ++--
 crates/tor-dirmgr/src/err.rs  | 2 +-
 crates/tor-error/src/lib.rs   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/tor-chanmgr/src/err.rs b/crates/tor-chanmgr/src/err.rs
index ec8dd56a8..eacebe373 100644
--- a/crates/tor-chanmgr/src/err.rs
+++ b/crates/tor-chanmgr/src/err.rs
@@ -74,10 +74,10 @@ impl tor_error::HasKind for Error {
         use Error as E;
         use ErrorKind as EK;
         match self {
-            E::ChanTimeout | E::Io { .. } | E::Proto(ProtoErr::IoErr(_)) => EK::TorConnectionFailed,
+            E::ChanTimeout | E::Io { .. } | E::Proto(ProtoErr::IoErr(_)) => EK::TorAccessFailed,
             E::Spawn { cause, .. } => cause.kind(),
             E::Proto(e) => e.kind(),
-            E::PendingFailed => EK::TorConnectionFailed,
+            E::PendingFailed => EK::TorAccessFailed,
             E::UnusableTarget(_) | E::Internal(_) => EK::Internal,
         }
     }
diff --git a/crates/tor-dirmgr/src/err.rs b/crates/tor-dirmgr/src/err.rs
index 8cada3973..2e7b05475 100644
--- a/crates/tor-dirmgr/src/err.rs
+++ b/crates/tor-dirmgr/src/err.rs
@@ -156,7 +156,7 @@ impl HasKind for Error {
             E::BadHexInCache(_) => EK::CacheCorrupted,
             E::UnrecognizedAuthorities => EK::TorProtocolViolation,
             E::ManagerDropped => EK::ArtiShuttingDown,
-            E::CantAdvanceState => EK::TorConnectionFailed,
+            E::CantAdvanceState => EK::TorAccessFailed,
             E::StorageError(_) => EK::CacheAccessFailed,
             E::ConsensusDiffError(_) => EK::TorProtocolViolation,
             E::NetDocError { source, .. } => match source {
diff --git a/crates/tor-error/src/lib.rs b/crates/tor-error/src/lib.rs
index 745418151..d70a836f7 100644
--- a/crates/tor-error/src/lib.rs
+++ b/crates/tor-error/src/lib.rs
@@ -117,7 +117,7 @@ pub enum ErrorKind {
     /// properly.  Not used for errors that occur within the Tor network, or accessing the public
     /// internet on the far side of Tor.
     #[display(fmt = "error connecting to Tor")]
-    TorConnectionFailed,
+    TorAccessFailed,
 
     /// An attempt was made to use a Tor client for something without bootstrapping it first.
     #[display(fmt = "attempted to use unbootstrapped client")]