Skip to content

Commit

Permalink
fixup! apps/config: remove DEFAULT_BASE_DIR constant
Browse files Browse the repository at this point in the history
  • Loading branch information
juped committed May 14, 2023
1 parent 7e408f7 commit 8b5ef3f
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions apps/src/lib/client/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ pub fn init_network(
// The `temp_chain_id` gets renamed after we have chain ID
let accounts_dir = temp_dir.join(NET_ACCOUNTS_DIR);
// Base dir used in account sub-directories
let accounts_temp_dir = PathBuf::from(default_namada_folder.clone())
.join(temp_chain_id.as_str());
let accounts_temp_dir =
default_namada_folder.join(temp_chain_id.as_str());

let mut rng: ThreadRng = thread_rng();

Expand Down Expand Up @@ -720,7 +720,7 @@ pub fn init_network(
// parameter. We need to remove this prefix, because
// these sub-directories will be moved to validators' root
// directories.
config.ledger.shell.base_dir = default_namada_folder.clone().into();
config.ledger.shell.base_dir = default_namada_folder.clone();
// Add a ledger P2P persistent peers
config.ledger.tendermint.p2p_persistent_peers = persistent_peers
.iter()
Expand Down Expand Up @@ -798,8 +798,8 @@ pub fn init_network(
// Create a release tarball for anoma-network-config
if !dont_archive {
let mut release = tar::Builder::new(Vec::new());
let release_genesis_path = PathBuf::from(default_namada_folder.clone())
.join(format!("{}.toml", chain_id.as_str()));
let release_genesis_path =
default_namada_folder.join(format!("{}.toml", chain_id.as_str()));
release
.append_path_with_name(genesis_path, release_genesis_path)
.unwrap();
Expand All @@ -819,11 +819,10 @@ pub fn init_network(
release
.append_path_with_name(chain_config_path, release_chain_config_path)
.unwrap();
let release_wasm_checksums_path =
PathBuf::from(default_namada_folder.clone())
.join(chain_id.as_str())
.join(config::DEFAULT_WASM_DIR)
.join(config::DEFAULT_WASM_CHECKSUMS_FILE);
let release_wasm_checksums_path = default_namada_folder
.join(chain_id.as_str())
.join(config::DEFAULT_WASM_DIR)
.join(config::DEFAULT_WASM_CHECKSUMS_FILE);
release
.append_path_with_name(
&wasm_checksums_path,
Expand Down

0 comments on commit 8b5ef3f

Please sign in to comment.