Support settable drone lamport cap (#3675)

This commit is contained in:
Jack May 2019-04-08 12:37:01 -07:00 committed by GitHub
parent 44b391096d
commit e551f6b552
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 9 deletions

View File

@ -758,7 +758,7 @@ mod tests {
cluster.transfer(&cluster.funding_keypair, &drone_keypair.pubkey(), 1_000_000);
let (addr_sender, addr_receiver) = channel();
run_local_drone(drone_keypair, addr_sender);
run_local_drone(drone_keypair, addr_sender, None);
let drone_addr = addr_receiver.recv_timeout(Duration::from_secs(2)).unwrap();
let mut cfg = Config::default();

View File

@ -243,10 +243,18 @@ pub fn request_airdrop_transaction(
}
// For integration tests. Listens on random open port and reports port to Sender.
pub fn run_local_drone(mint_keypair: Keypair, sender: Sender<SocketAddr>) {
pub fn run_local_drone(
mint_keypair: Keypair,
sender: Sender<SocketAddr>,
request_cap_input: Option<u64>,
) {
thread::spawn(move || {
let drone_addr = socketaddr!(0, 0);
let drone = Arc::new(Mutex::new(Drone::new(mint_keypair, None, None)));
let drone = Arc::new(Mutex::new(Drone::new(
mint_keypair,
None,
request_cap_input,
)));
let socket = TcpListener::bind(&drone_addr).unwrap();
sender.send(socket.local_addr().unwrap()).unwrap();
info!("Drone started. Listening on: {}", drone_addr);

View File

@ -19,7 +19,7 @@ fn test_local_drone() {
let expected_tx = Transaction::new(&[&keypair], message, blockhash);
let (sender, receiver) = channel();
run_local_drone(keypair, sender);
run_local_drone(keypair, sender, None);
let drone_addr = receiver.recv().unwrap();
let result = request_airdrop_transaction(&drone_addr, &to, lamports, blockhash);

View File

@ -23,7 +23,7 @@ fn test_wallet_deploy_program() {
let (server, leader_data, alice, ledger_path) = new_fullnode_for_tests();
let (sender, receiver) = channel();
run_local_drone(alice, sender);
run_local_drone(alice, sender, None);
let drone_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc);

View File

@ -24,7 +24,7 @@ fn test_wallet_timestamp_tx() {
let bob_pubkey = Pubkey::new_rand();
let (sender, receiver) = channel();
run_local_drone(alice, sender);
run_local_drone(alice, sender, None);
let drone_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc);
@ -88,7 +88,7 @@ fn test_wallet_witness_tx() {
let bob_pubkey = Pubkey::new_rand();
let (sender, receiver) = channel();
run_local_drone(alice, sender);
run_local_drone(alice, sender, None);
let drone_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc);
@ -149,7 +149,7 @@ fn test_wallet_cancel_tx() {
let bob_pubkey = Pubkey::new_rand();
let (sender, receiver) = channel();
run_local_drone(alice, sender);
run_local_drone(alice, sender, None);
let drone_addr = receiver.recv().unwrap();
let rpc_client = RpcClient::new_socket(leader_data.rpc);

View File

@ -10,7 +10,7 @@ use std::sync::mpsc::channel;
fn test_wallet_request_airdrop() {
let (server, leader_data, alice, ledger_path) = new_fullnode_for_tests();
let (sender, receiver) = channel();
run_local_drone(alice, sender);
run_local_drone(alice, sender, None);
let drone_addr = receiver.recv().unwrap();
let mut bob_config = WalletConfig::default();