Skip to content

Commit d3a1c3f

Browse files
committed
fix: devnet urls, remove v1 faucet, include .movement and .aptos in .gitignore
1 parent b50806d commit d3a1c3f

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,7 @@ test_indexer_grpc/*
139139
# ignore boogie bpl
140140
boogie.bpl
141141

142-
# ingore movement or aptos configs
143-
**/config.yaml
142+
# ingore .movement or .aptos dirs and configs
143+
**/.movement
144+
**/.aptos
145+
**/config.yaml

crates/aptos/src/common/init.rs

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ impl CliCommand<()> for InitTool {
138138
profile_config.rest_url =
139139
Some("https://full.testnet.movementinfra.xyz/v1".to_string());
140140
profile_config.faucet_url =
141-
Some("https://faucet.testnet.movementinfra.xyz/v1".to_string());
141+
Some("https://faucet.testnet.movementinfra.xyz".to_string());
142142
},
143143
Network::Devnet => {
144144
profile_config.rest_url =
145-
Some("https://aptos.devnet.inola.movementlabs.xyz/v1".to_string());
145+
Some("https://full.devnet.movementinfra.xyz/v1".to_string());
146146
profile_config.faucet_url =
147-
Some("https://faucet.devnet.inola.movementlabs.xyz".to_string());
147+
Some("https://faucet.devnet.movementinfra.xyz".to_string());
148148
},
149149
Network::Local => {
150150
profile_config.rest_url = Some("http://localhost:8080".to_string());
@@ -328,11 +328,9 @@ impl CliCommand<()> for InitTool {
328328
}
329329
} else if account_exists {
330330
eprintln!("Account {} has been already found onchain", address);
331-
}
332-
else if network == Network::Mainnet {
331+
} else if network == Network::Mainnet {
333332
eprintln!("Account {} does not exist, you will need to create and fund the account by transferring funds from another account", address);
334-
}
335-
else {
333+
} else {
336334
eprintln!("Account {} has been initialized locally, but you must transfer coins to it to create the account onchain", address);
337335
}
338336

@@ -452,17 +450,13 @@ pub enum Network {
452450

453451
impl Display for Network {
454452
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
455-
write!(
456-
f,
457-
"{}",
458-
match self {
459-
Network::Mainnet => "mainnet",
460-
Network::Testnet => "bardock+testnet",
461-
Network::Devnet => "devnet",
462-
Network::Local => "local",
463-
Network::Custom => "custom",
464-
}
465-
)
453+
write!(f, "{}", match self {
454+
Network::Mainnet => "mainnet",
455+
Network::Testnet => "bardock+testnet",
456+
Network::Devnet => "devnet",
457+
Network::Local => "local",
458+
Network::Custom => "custom",
459+
})
466460
}
467461
}
468462

@@ -478,7 +472,7 @@ impl FromStr for Network {
478472
"custom" => Self::Custom,
479473
str => {
480474
return Err(CliError::CommandArgumentError(format!(
481-
"Invalid network {}. Must be one of [testnet, local, custom]",
475+
"Invalid network {}. Must be one of [testnet, devnet, local, custom]",
482476
str
483477
)));
484478
},

0 commit comments

Comments
 (0)