Merge remote-tracking branch 'upstream/master' into correct-sendtxn
This commit is contained in:
commit
d0df8b495c
49 changed files with 747 additions and 281 deletions
|
@ -12,11 +12,11 @@ use trust_dns_resolver::TokioAsyncResolver;
|
|||
|
||||
pub const COUNTER: &str = "c";
|
||||
|
||||
pub type DestinationCache = Arc<RwLock<HashMap<Box<ServerName>, (String, Option<String>)>>>;
|
||||
type WellKnownMap = HashMap<Box<ServerName>, (String, Option<String>)>;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct Globals {
|
||||
pub actual_destination_cache: DestinationCache, // actual_destination, host
|
||||
pub actual_destination_cache: Arc<RwLock<WellKnownMap>>, // actual_destination, host
|
||||
pub(super) globals: sled::Tree,
|
||||
config: Config,
|
||||
keypair: Arc<ruma::signatures::Ed25519KeyPair>,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue