gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wallet: add --url, remove --host/--rpc-host/--rpc-port/-rpc-tls (#4153)

Browse Source 
Also by default the wallet now talks to testnet.solana.com instead of
localhost
This commit is contained in:
Michael Vines
2019-05-06 07:38:26 -07:00
committed by GitHub
parent 71f9b44687
commit 9b50583641
14 changed files with 103 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
install/src/main.rs
View File

@@ -10,15 +10,23 @@ mod config;
mod defaults;
mod update_manifest;
fn url_validator(url: String) -> Result<(), String> {
match url::Url::parse(&url) {
Ok(_) => Ok(()),
// Return an error if a url cannot be parsed.
fn is_url(string: String) -> Result<(), String> {
match url::Url::parse(&string) {
Ok(url) => {
if url.has_host() {
Ok(())
} else {
Err("no host provided".to_string())
}
}
Err(err) => Err(format!("{:?}", err)),
}
}
fn pubkey_validator(pubkey: String) -> Result<(), String> {
match pubkey.parse::<Pubkey>() {
// Return an error if a pubkey cannot be parsed.
fn is_pubkey(string: String) -> Result<(), String> {
match string.parse::<Pubkey>() {
Ok(_) => Ok(()),
Err(err) => Err(format!("{:?}", err)),
}
@@ -67,7 +75,7 @@ fn main() -> Result<(), String> {
.value_name("URL")
.takes_value(true)
.default_value(defaults::JSON_RPC_URL)
.validator(url_validator)
.validator(is_url)
.help("JSON RPC URL for the solana cluster"),
)
.arg(
@@ -82,7 +90,7 @@ fn main() -> Result<(), String> {
.value_name("PUBKEY")
.takes_value(true)
.required(true)
.validator(pubkey_validator)
.validator(is_pubkey)
.help("Public key of the update manifest");
match defaults::update_manifest_pubkey(build_env::TARGET) {
@@ -128,14 +136,14 @@ fn main() -> Result<(), String> {
.value_name("URL")
.takes_value(true)
.default_value(defaults::JSON_RPC_URL)
.validator(url_validator)
.validator(is_url)
.help("JSON RPC URL for the solana cluster"),
)
.arg(
Arg::with_name("download_url")
.index(1)
.required(true)
.validator(url_validator)
.validator(is_url)
.help("URL to the solana release archive"),
)
.arg(