Commit 166af2c3 authored by Ian Jackson's avatar Ian Jackson
Browse files

Fix error return type of AuthorityBuilder

parent 0036b916
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@


use derive_builder::Builder;
use derive_builder::Builder;
use serde::Deserialize;
use serde::Deserialize;
use tor_config::ConfigBuildError;
use tor_llcrypto::pk::rsa::RsaIdentity;
use tor_llcrypto::pk::rsa::RsaIdentity;


/// A single authority that signs a consensus directory.
/// A single authority that signs a consensus directory.
@@ -13,6 +14,7 @@ use tor_llcrypto::pk::rsa::RsaIdentity;
// we want our authorities format to be future-proof against adding new info
// we want our authorities format to be future-proof against adding new info
// about each authority.
// about each authority.
#[derive(Deserialize, Debug, Clone, Builder, Eq, PartialEq)]
#[derive(Deserialize, Debug, Clone, Builder, Eq, PartialEq)]
#[builder(build_fn(error = "ConfigBuildError"))]
#[builder(derive(Deserialize))]
#[builder(derive(Deserialize))]
pub struct Authority {
pub struct Authority {
    /// A memorable nickname for this authority.
    /// A memorable nickname for this authority.
+4 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,10 @@ BREAKING: Added `ChanProvenance` to `ChanMgr::get_or_launch`.
MODIFIED: Added a new variant in tor_circmgr::Error.
MODIFIED: Added a new variant in tor_circmgr::Error.
BREAKING: Made internal scheduled entry points non-public.
BREAKING: Made internal scheduled entry points non-public.


### tor-dirmgr

BREAKING: AuthorityBuilder::build now throws ConfigBuildError, not a custom error type

### tor-guardmgr
### tor-guardmgr


MODIFIED: New functions to get estimated clock skew.
MODIFIED: New functions to get estimated clock skew.