GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Bogdan-Ștefan Neacșu
2023-01-31 16:19:34 +02:00
parent ca3bfc859a
commit 2c88ca137a
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nym-api/src/support/cli/mod.rs
+1 -19
View File
@@ -122,38 +122,20 @@ pub(crate) fn build_config(args: CliArgs) -> Result<Config> {
let config = override_config(config_from_file, args);
<<<<<<< HEAD
if !_already_initialized {
=======
if already_initialized {
fs::create_dir_all(Config::default_config_directory(&id))
.expect("Could not create config directory");
fs::create_dir_all(Config::default_data_directory(&id))
.expect("Could not create data directory");
#[cfg(feature = "coconut")]
>>>>>>> release/v1.1.8
crate::coconut::dkg::controller::init_keypair(&config)?;
}
Ok(config)
}
pub(crate) fn override_config(mut config: Config, args: CliArgs) -> Config {
<<<<<<< HEAD
if let Some(id) = args.id {
fs::create_dir_all(Config::default_config_directory(Some(&id)))
.expect("Could not create config directory");
fs::create_dir_all(Config::default_data_directory(Some(&id)))
.expect("Could not create data directory");
config = config.with_id(&id);
}
pub(crate) fn override_config(config: Config, args: CliArgs) -> Config {
config
=======
config = config
.with_id(&args.id)
>>>>>>> release/v1.1.8
.with_optional(Config::with_custom_nyxd_validator, args.nyxd_validator)
.with_optional_env(
Config::with_custom_mixnet_contract,