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

2
wallet/tests/deploy.rs
View File

@@ -30,7 +30,7 @@ fn test_wallet_deploy_program() {
let mut config = WalletConfig::default();
config.drone_port = drone_addr.port();
config.rpc_port = leader_data.rpc.port();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
config.command = WalletCommand::Airdrop(50);
process_command(&config).unwrap();

21
wallet/tests/pay.rs
View File

@@ -31,11 +31,12 @@ fn test_wallet_timestamp_tx() {
let mut config_payer = WalletConfig::default();
config_payer.drone_port = drone_addr.port();
config_payer.rpc_port = leader_data.rpc.port();
config_payer.json_rpc_url =
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
let mut config_witness = WalletConfig::default();
config_witness.drone_port = drone_addr.port();
config_witness.rpc_port = leader_data.rpc.port();
config_witness.drone_port = config_payer.drone_port;
config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
assert_ne!(
config_payer.keypair.pubkey(),
@@ -95,11 +96,12 @@ fn test_wallet_witness_tx() {
let mut config_payer = WalletConfig::default();
config_payer.drone_port = drone_addr.port();
config_payer.rpc_port = leader_data.rpc.port();
config_payer.json_rpc_url =
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
let mut config_witness = WalletConfig::default();
config_witness.drone_port = drone_addr.port();
config_witness.rpc_port = leader_data.rpc.port();
config_witness.drone_port = config_payer.drone_port;
config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
assert_ne!(
config_payer.keypair.pubkey(),
@@ -156,11 +158,12 @@ fn test_wallet_cancel_tx() {
let mut config_payer = WalletConfig::default();
config_payer.drone_port = drone_addr.port();
config_payer.rpc_port = leader_data.rpc.port();
config_payer.json_rpc_url =
format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
let mut config_witness = WalletConfig::default();
config_witness.drone_port = drone_addr.port();
config_witness.rpc_port = leader_data.rpc.port();
config_witness.drone_port = config_payer.drone_port;
config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
assert_ne!(
config_payer.keypair.pubkey(),

3
wallet/tests/request_airdrop.rs
View File

@@ -15,7 +15,8 @@ fn test_wallet_request_airdrop() {
let mut bob_config = WalletConfig::default();
bob_config.drone_port = drone_addr.port();
bob_config.rpc_port = leader_data.rpc.port();
bob_config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
bob_config.command = WalletCommand::Airdrop(50);
let sig_response = process_command(&bob_config);