Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions cmd/crates/soroban-test/tests/it/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ fn multiple_networks() {
#[test]
fn read_key() {
let sandbox = TestEnv::default();
let dir = sandbox.dir().as_ref();
add_test_id(dir);
let ident_dir = dir.join(".soroban/identity");
let config_dir = sandbox.config_dir();
add_test_id(&config_dir);
let ident_dir = config_dir.join("identity");
assert!(ident_dir.exists());
sandbox
.new_assert_cmd("keys")
Expand Down Expand Up @@ -179,17 +179,16 @@ fn generate_key_on_testnet() {
#[test]
fn seed_phrase() {
let sandbox = TestEnv::default();
let dir = sandbox.dir();
let config_dir = sandbox.config_dir();
add_key(
dir,
&config_dir,
"test_seed",
SecretKind::Seed,
"one two three four five six seven eight nine ten eleven twelve",
);

sandbox
.new_assert_cmd("keys")
.current_dir(dir)
.arg("ls")
.assert()
.stdout(predicates::str::contains("test_seed\n"));
Expand Down
4 changes: 1 addition & 3 deletions cmd/crates/soroban-test/tests/it/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ pub fn add_key(dir: &Path, name: &str, kind: SecretKind, data: &str) {
},
};

KeyType::Identity
.write(name, &secret, &dir.join(".soroban"))
.unwrap();
KeyType::Identity.write(name, &secret, dir).unwrap();
}

pub fn add_test_id(dir: &Path) -> String {
Expand Down
15 changes: 8 additions & 7 deletions cmd/soroban-cli/src/commands/contract/alias/ls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,19 @@ impl Cmd {

for cfg in config_dirs {
match cfg {
Location::Local(config_dir) => Self::read_from_config_dir(&config_dir, true)?,
Location::Global(config_dir) => Self::read_from_config_dir(&config_dir, false)?,
Location::Local(config_dir) => {
if config_dir.exists() {
print_deprecation_warning(&config_dir);
}
}
Location::Global(config_dir) => Self::read_from_config_dir(&config_dir)?,
}
}

Ok(())
}

fn read_from_config_dir(config_dir: &Path, deprecation_mode: bool) -> Result<(), Error> {
fn read_from_config_dir(config_dir: &Path) -> Result<(), Error> {
let pattern = config_dir
.join("contract-ids")
.join("*.json")
Expand Down Expand Up @@ -98,9 +102,6 @@ impl Cmd {
list.sort_by(|a, b| a.alias.cmp(&b.alias));

for entry in list {
if !found && deprecation_mode {
print_deprecation_warning(config_dir);
}
found = true;
println!("{}: {}", entry.alias, entry.contract);
}
Expand All @@ -109,7 +110,7 @@ impl Cmd {
}
}

if !found && !deprecation_mode {
if !found {
eprintln!("⚠️ No aliases defined for network");

process::exit(1);
Expand Down
Loading
Loading