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

Move drone arguments under the airdrop command (#5741)

Browse Source
This commit is contained in:
Michael Vines
2019-08-29 20:45:53 -07:00
committed by GitHub
parent 33e7e23484
commit f78baf80e4
6 changed files with 96 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/tests/deploy.rs
View File

@ -29,9 +29,12 @@ fn test_wallet_deploy_program() {
let rpc_client = RpcClient::new_socket(leader_data.rpc);
let mut config = WalletConfig::default();
config.drone_port = drone_addr.port();
config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
config.command = WalletCommand::Airdrop(50);
config.command = WalletCommand::Airdrop {
drone_host: None,
drone_port: drone_addr.port(),
lamports: 50,
};
process_command(&config).unwrap();
config.command = WalletCommand::Deploy(pathbuf.to_str().unwrap().to_string());

6
cli/tests/pay.rs
View File

@ -40,12 +40,10 @@ fn test_wallet_timestamp_tx() {
let rpc_client = RpcClient::new_socket(leader_data.rpc);
let mut config_payer = WalletConfig::default();
config_payer.drone_port = drone_addr.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 = config_payer.drone_port;
config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
assert_ne!(
@ -113,12 +111,10 @@ fn test_wallet_witness_tx() {
let rpc_client = RpcClient::new_socket(leader_data.rpc);
let mut config_payer = WalletConfig::default();
config_payer.drone_port = drone_addr.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 = config_payer.drone_port;
config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
assert_ne!(
@ -182,12 +178,10 @@ fn test_wallet_cancel_tx() {
let rpc_client = RpcClient::new_socket(leader_data.rpc);
let mut config_payer = WalletConfig::default();
config_payer.drone_port = drone_addr.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 = config_payer.drone_port;
config_witness.json_rpc_url = config_payer.json_rpc_url.clone();
assert_ne!(

8
cli/tests/request_airdrop.rs
View File

@ -14,10 +14,12 @@ fn test_wallet_request_airdrop() {
let drone_addr = receiver.recv().unwrap();
let mut bob_config = WalletConfig::default();
bob_config.drone_port = drone_addr.port();
bob_config.json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
bob_config.command = WalletCommand::Airdrop(50);
bob_config.command = WalletCommand::Airdrop {
drone_host: None,
drone_port: drone_addr.port(),
lamports: 50,
};
let sig_response = process_command(&bob_config);
sig_response.unwrap();