Overhaul wallet rpc/drone command-line arguments

This commit is contained in:
Michael Vines
2019-01-16 20:43:00 -08:00
parent 00c4c30d72
commit a84b6bc7e4
10 changed files with 220 additions and 126 deletions

View File

@@ -72,14 +72,12 @@ fn test_wallet_timestamp_tx() {
let rpc_client = RpcClient::new_from_socket(leader_data.rpc);
let mut config_payer = WalletConfig::default();
config_payer.network = leader_data.gossip;
config_payer.drone_port = Some(drone_addr.port());
config_payer.rpc_port = Some(leader_data.rpc.port());
config_payer.drone_port = drone_addr.port();
config_payer.rpc_port = leader_data.rpc.port();
let mut config_witness = WalletConfig::default();
config_witness.network = leader_data.gossip;
config_witness.drone_port = Some(drone_addr.port());
config_witness.rpc_port = Some(leader_data.rpc.port());
config_witness.drone_port = drone_addr.port();
config_witness.rpc_port = leader_data.rpc.port();
assert_ne!(config_payer.id.pubkey(), config_witness.id.pubkey());
@@ -173,14 +171,12 @@ fn test_wallet_witness_tx() {
let rpc_client = RpcClient::new_from_socket(leader_data.rpc);
let mut config_payer = WalletConfig::default();
config_payer.network = leader_data.gossip;
config_payer.drone_port = Some(drone_addr.port());
config_payer.rpc_port = Some(leader_data.rpc.port());
config_payer.drone_port = drone_addr.port();
config_payer.rpc_port = leader_data.rpc.port();
let mut config_witness = WalletConfig::default();
config_witness.network = leader_data.gossip;
config_witness.drone_port = Some(drone_addr.port());
config_witness.rpc_port = Some(leader_data.rpc.port());
config_witness.drone_port = drone_addr.port();
config_witness.rpc_port = leader_data.rpc.port();
assert_ne!(config_payer.id.pubkey(), config_witness.id.pubkey());
@@ -270,14 +266,12 @@ fn test_wallet_cancel_tx() {
let rpc_client = RpcClient::new_from_socket(leader_data.rpc);
let mut config_payer = WalletConfig::default();
config_payer.network = leader_data.gossip;
config_payer.drone_port = Some(drone_addr.port());
config_payer.rpc_port = Some(leader_data.rpc.port());
config_payer.drone_port = drone_addr.port();
config_payer.rpc_port = leader_data.rpc.port();
let mut config_witness = WalletConfig::default();
config_witness.network = leader_data.gossip;
config_witness.drone_port = Some(drone_addr.port());
config_witness.rpc_port = Some(leader_data.rpc.port());
config_witness.drone_port = drone_addr.port();
config_witness.rpc_port = leader_data.rpc.port();
assert_ne!(config_payer.id.pubkey(), config_witness.id.pubkey());