rustfmt
This commit is contained in:
@@ -80,13 +80,17 @@ impl OverrideConfig {
|
||||
Config::with_enabled_network_requester,
|
||||
self.with_network_requester,
|
||||
)
|
||||
.with_optional(Config::with_enabled_ip_packet_router, self.with_ip_packet_router);
|
||||
.with_optional(
|
||||
Config::with_enabled_ip_packet_router,
|
||||
self.with_ip_packet_router,
|
||||
);
|
||||
|
||||
if config.network_requester.enabled
|
||||
&& config.storage_paths.network_requester_config.is_none()
|
||||
{
|
||||
Ok(config.with_default_network_requester_config_path())
|
||||
} else if config.ip_packet_router.enabled && config.storage_paths.ip_packet_router_config.is_none()
|
||||
} else if config.ip_packet_router.enabled
|
||||
&& config.storage_paths.ip_packet_router_config.is_none()
|
||||
{
|
||||
Ok(config.with_default_ip_packet_router_config_path())
|
||||
} else {
|
||||
|
||||
@@ -244,7 +244,8 @@ pub async fn execute(args: Init) -> anyhow::Result<()> {
|
||||
initialise_local_network_requester(&config, nr_opts, *identity_keys.public_key())
|
||||
.await?;
|
||||
} else if config.ip_packet_router.enabled {
|
||||
initialise_local_ip_packet_router(&config, ip_opts, *identity_keys.public_key()).await?;
|
||||
initialise_local_ip_packet_router(&config, ip_opts, *identity_keys.public_key())
|
||||
.await?;
|
||||
}
|
||||
|
||||
eprintln!("Saved identity and mixnet sphinx keypairs");
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
use self::helpers::load_ip_packet_router_config;
|
||||
use self::storage::PersistentStorage;
|
||||
use crate::commands::helpers::{
|
||||
override_ip_packet_router_config, override_network_requester_config, OverrideIpPacketRouterConfig,
|
||||
OverrideNetworkRequesterConfig,
|
||||
override_ip_packet_router_config, override_network_requester_config,
|
||||
OverrideIpPacketRouterConfig, OverrideNetworkRequesterConfig,
|
||||
};
|
||||
use crate::config::Config;
|
||||
use crate::error::GatewayError;
|
||||
|
||||
Reference in New Issue
Block a user