From dd07ce68f45f345ae32c922aa508c803b73961ff Mon Sep 17 00:00:00 2001 From: Gleb Date: Fri, 15 Nov 2024 15:39:45 -0800 Subject: [PATCH 1/3] fix config tests --- cmd/crates/soroban-test/tests/it/config.rs | 96 ++++++++++++---------- cmd/soroban-cli/src/config/mod.rs | 8 +- 2 files changed, 59 insertions(+), 45 deletions(-) diff --git a/cmd/crates/soroban-test/tests/it/config.rs b/cmd/crates/soroban-test/tests/it/config.rs index b796910a8..a37b3ffec 100644 --- a/cmd/crates/soroban-test/tests/it/config.rs +++ b/cmd/crates/soroban-test/tests/it/config.rs @@ -19,20 +19,27 @@ fn ls(sandbox: &TestEnv) -> Vec { .collect::>() } +pub const NETWORKS: &str = "\ +local +futurenet +mainnet +testnet +"; + #[test] fn set_and_remove_network() { TestEnv::with_default(|sandbox| { - add_network(sandbox, "local"); - let dir = sandbox.dir().join(".soroban").join("network"); + add_network(sandbox, "custom"); + let dir = sandbox.dir().join(".stellar").join("network"); let mut read_dir = std::fs::read_dir(dir).unwrap(); let file = read_dir.next().unwrap().unwrap(); - assert_eq!(file.file_name().to_str().unwrap(), "local.toml"); + assert_eq!(file.file_name().to_str().unwrap(), "custom.toml"); let res = ls(sandbox); - assert_eq!(res[0], "local"); + assert_eq!(res[0], "custom"); sandbox .new_assert_cmd("network") .arg("rm") - .arg("local") + .arg("custom") .assert() .success(); @@ -40,37 +47,7 @@ fn set_and_remove_network() { .new_assert_cmd("network") .arg("ls") .assert() - .stdout("\n"); - }); -} - -#[test] -fn use_default_futurenet() { - TestEnv::with_default(|sandbox| { - sandbox - .new_assert_cmd("keys") - .args(["generate", "alice", "--network", "futurenet"]) - .assert() - .success(); - let dir = sandbox.dir().join(".soroban").join("network"); - let mut read_dir = std::fs::read_dir(dir).unwrap(); - let file = read_dir.next().unwrap().unwrap(); - assert_eq!(file.file_name().to_str().unwrap(), "futurenet.toml"); - }); -} - -#[test] -fn use_default_testnet() { - TestEnv::with_default(|sandbox| { - sandbox - .new_assert_cmd("keys") - .args(["generate", "alice", "--network", "testnet"]) - .assert() - .success(); - let dir = sandbox.dir().join(".soroban").join("network"); - let mut read_dir = std::fs::read_dir(dir).unwrap(); - let file = read_dir.next().unwrap().unwrap(); - assert_eq!(file.file_name().to_str().unwrap(), "testnet.toml"); + .stdout(NETWORKS); }); } @@ -118,7 +95,7 @@ fn set_and_remove_global_network() { .arg("ls") .arg("--global") .assert() - .stdout("global\n"); + .stdout(format!("global\n{}", NETWORKS)); sandbox .new_assert_cmd("network") @@ -134,7 +111,7 @@ fn set_and_remove_global_network() { .env("XDG_CONFIG_HOME", dir.to_str().unwrap()) .arg("ls") .assert() - .stdout("\n"); + .stdout(NETWORKS); } #[test] @@ -142,15 +119,35 @@ fn multiple_networks() { let sandbox = TestEnv::default(); let ls = || -> Vec { ls(&sandbox) }; - add_network(&sandbox, "local"); + println!("{:#?}", ls()); + add_network(&sandbox, "custom"); println!("{:#?}", ls()); add_network(&sandbox, "local2"); - assert_eq!(ls().as_slice(), ["local".to_owned(), "local2".to_owned()]); + assert_eq!( + ls().as_slice(), + [ + "custom".to_owned(), + "local2".to_owned(), + "local".to_owned(), + "futurenet".to_owned(), + "mainnet".to_owned(), + "testnet".to_owned() + ] + ); - sandbox.cmd::("local").run().unwrap(); + sandbox.cmd::("custom").run().unwrap(); - assert_eq!(ls().as_slice(), ["local2".to_owned()]); + assert_eq!( + ls().as_slice(), + [ + "local2".to_owned(), + "local".to_owned(), + "futurenet".to_owned(), + "mainnet".to_owned(), + "testnet".to_owned() + ] + ); let sub_dir = sandbox.dir().join("sub_directory"); fs::create_dir(&sub_dir).unwrap(); @@ -168,7 +165,17 @@ fn multiple_networks() { .run() .unwrap(); - assert_eq!(ls().as_slice(), ["local2".to_owned(), "local3".to_owned()]); + assert_eq!( + ls().as_slice(), + [ + "local2".to_owned(), + "local3".to_owned(), + "local".to_owned(), + "futurenet".to_owned(), + "mainnet".to_owned(), + "testnet".to_owned() + ] + ); } #[test] @@ -205,7 +212,7 @@ fn generate_key() { .assert() .stdout(predicates::str::contains("test_2\n")); let file_contents = - fs::read_to_string(sandbox.dir().join(".soroban/identity/test_2.toml")).unwrap(); + fs::read_to_string(sandbox.dir().join(".stellar/identity/test_2.toml")).unwrap(); assert_eq!( file_contents, format!("seed_phrase = \"{DEFAULT_SEED_PHRASE}\"\n") @@ -368,6 +375,7 @@ fn set_default_identity() { sandbox .new_assert_cmd("env") + .env_remove("SOROBAN_ACCOUNT") .assert() .stdout(predicate::str::contains("STELLAR_ACCOUNT=alice")) .success(); diff --git a/cmd/soroban-cli/src/config/mod.rs b/cmd/soroban-cli/src/config/mod.rs index a429ff434..af374b634 100644 --- a/cmd/soroban-cli/src/config/mod.rs +++ b/cmd/soroban-cli/src/config/mod.rs @@ -192,7 +192,13 @@ impl Config { pub fn save(&self) -> Result<(), locator::Error> { let toml_string = toml::to_string(&self)?; - let mut file = File::create(locator::config_file()?)?; + let path = locator::config_file()?; + let parent = path.parent(); + if let Some(parent) = parent { + fs::create_dir_all(parent)?; + } + // Depending on the platform, this function may fail if the full directory path does not exist + let mut file = File::create(path)?; file.write_all(toml_string.as_bytes())?; Ok(()) From b856053043d7c802082723c8b96b1cd59bef17de Mon Sep 17 00:00:00 2001 From: Gleb Date: Fri, 15 Nov 2024 15:50:53 -0800 Subject: [PATCH 2/3] Fix version test --- cmd/crates/soroban-test/tests/it/version.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/crates/soroban-test/tests/it/version.rs b/cmd/crates/soroban-test/tests/it/version.rs index cb7826fa4..878dbd758 100644 --- a/cmd/crates/soroban-test/tests/it/version.rs +++ b/cmd/crates/soroban-test/tests/it/version.rs @@ -8,5 +8,5 @@ fn version() { .new_assert_cmd("version") .assert() .success() - .stdout(format!("soroban {}\n", long())); + .stdout(format!("stellar {}\n", long())); } From e76e7fc836a6ba3656638c47280c16f0703a280e Mon Sep 17 00:00:00 2001 From: Willem Wyndham Date: Fri, 29 Nov 2024 14:57:06 -0500 Subject: [PATCH 3/3] fix: clippy --- cmd/crates/soroban-test/tests/it/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/crates/soroban-test/tests/it/config.rs b/cmd/crates/soroban-test/tests/it/config.rs index a37b3ffec..fb751ecf1 100644 --- a/cmd/crates/soroban-test/tests/it/config.rs +++ b/cmd/crates/soroban-test/tests/it/config.rs @@ -95,7 +95,7 @@ fn set_and_remove_global_network() { .arg("ls") .arg("--global") .assert() - .stdout(format!("global\n{}", NETWORKS)); + .stdout(format!("global\n{NETWORKS}")); sandbox .new_assert_cmd("network")