Merge branch 'network-config-error' into 'main'
Delete tor_dirmgr::Error::BadNetworkConfig See merge request tpo/core/arti!506
This commit is contained in:
commit
f0eac61838
|
@ -30,9 +30,6 @@ pub enum Error {
|
||||||
/// A schema version that says we can't read it.
|
/// A schema version that says we can't read it.
|
||||||
#[error("unrecognized data storage schema")]
|
#[error("unrecognized data storage schema")]
|
||||||
UnrecognizedSchema,
|
UnrecognizedSchema,
|
||||||
/// We couldn't configure the network.
|
|
||||||
#[error("bad network configuration")]
|
|
||||||
BadNetworkConfig(&'static str),
|
|
||||||
/// User requested an operation that required a usable
|
/// User requested an operation that required a usable
|
||||||
/// bootstrapped directory, but we didn't have one.
|
/// bootstrapped directory, but we didn't have one.
|
||||||
#[error("directory not present or not up-to-date")]
|
#[error("directory not present or not up-to-date")]
|
||||||
|
@ -163,7 +160,6 @@ impl Error {
|
||||||
| Error::CachePermissions(_)
|
| Error::CachePermissions(_)
|
||||||
| Error::SqliteError(_)
|
| Error::SqliteError(_)
|
||||||
| Error::UnrecognizedSchema
|
| Error::UnrecognizedSchema
|
||||||
| Error::BadNetworkConfig(_)
|
|
||||||
| Error::DirectoryNotPresent
|
| Error::DirectoryNotPresent
|
||||||
| Error::ManagerDropped
|
| Error::ManagerDropped
|
||||||
| Error::CantAdvanceState
|
| Error::CantAdvanceState
|
||||||
|
@ -226,7 +222,6 @@ impl HasKind for Error {
|
||||||
}
|
}
|
||||||
E::SqliteError(e) => sqlite_error_kind(e),
|
E::SqliteError(e) => sqlite_error_kind(e),
|
||||||
E::UnrecognizedSchema => EK::CacheCorrupted,
|
E::UnrecognizedSchema => EK::CacheCorrupted,
|
||||||
E::BadNetworkConfig(_) => EK::InvalidConfig,
|
|
||||||
E::DirectoryNotPresent => EK::DirectoryExpired,
|
E::DirectoryNotPresent => EK::DirectoryExpired,
|
||||||
E::NetDirOlder => EK::TorDirectoryError,
|
E::NetDirOlder => EK::TorDirectoryError,
|
||||||
E::BadUtf8FromDirectory(_) => EK::TorProtocolViolation,
|
E::BadUtf8FromDirectory(_) => EK::TorProtocolViolation,
|
||||||
|
|
|
@ -34,6 +34,7 @@ MODIFIED: New APIs for CachedDir, Error.
|
||||||
### tor-dirmgr
|
### tor-dirmgr
|
||||||
|
|
||||||
BREAKING: Added new cache_trust element to DirMgrConfig.
|
BREAKING: Added new cache_trust element to DirMgrConfig.
|
||||||
|
BREAKING: Delete Error::BadNetworkConfig
|
||||||
|
|
||||||
### tor-netdoc
|
### tor-netdoc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue