leader_scheduler: remove bootstrap_height

wallet/tests/deploy.rs

@@ -11,6 +11,8 @@ use std::sync::mpsc::channel;
 
 #[test]
 fn test_wallet_deploy_program() {
+    solana_logger::setup();
+
     let mut pathbuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     pathbuf.push("tests");
     pathbuf.push("fixtures");
@@ -18,6 +20,7 @@ fn test_wallet_deploy_program() {
     pathbuf.set_extension("so");
 
     let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_deploy_program");
+    let server_exit = server.run(None);
 
     let (sender, receiver) = channel();
     run_local_drone(alice, sender);
@@ -73,6 +76,6 @@ fn test_wallet_deploy_program() {
         &elf
     );
 
-    server.close().unwrap();
+    server_exit();
     remove_dir_all(ledger_path).unwrap();
 }

wallet/tests/pay.rs

@@ -25,6 +25,7 @@ fn check_balance(expected_balance: u64, client: &RpcClient, params: Value) {
 #[test]
 fn test_wallet_timestamp_tx() {
     let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_timestamp_tx");
+    let server_exit = server.run(None);
     let bob_pubkey = Keypair::new().pubkey();
 
     let (sender, receiver) = channel();
@@ -85,13 +86,14 @@ fn test_wallet_timestamp_tx() {
     let params = json!([format!("{}", bob_pubkey)]);
     check_balance(10, &rpc_client, params); // recipient balance
 
-    server.close().unwrap();
+    server_exit();
     remove_dir_all(ledger_path).unwrap();
 }
 
 #[test]
 fn test_wallet_witness_tx() {
     let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_witness_tx");
+    let server_exit = server.run(None);
     let bob_pubkey = Keypair::new().pubkey();
 
     let (sender, receiver) = channel();
@@ -148,13 +150,14 @@ fn test_wallet_witness_tx() {
     let params = json!([format!("{}", bob_pubkey)]);
     check_balance(10, &rpc_client, params); // recipient balance
 
-    server.close().unwrap();
+    server_exit();
     remove_dir_all(ledger_path).unwrap();
 }
 
 #[test]
 fn test_wallet_cancel_tx() {
     let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_cancel_tx");
+    let server_exit = server.run(None);
     let bob_pubkey = Keypair::new().pubkey();
 
     let (sender, receiver) = channel();
@@ -211,6 +214,6 @@ fn test_wallet_cancel_tx() {
     let params = json!([format!("{}", bob_pubkey)]);
     check_balance(0, &rpc_client, params); // recipient balance
 
-    server.close().unwrap();
+    server_exit();
     remove_dir_all(ledger_path).unwrap();
 }

wallet/tests/request_airdrop.rs

@@ -10,7 +10,7 @@ use std::sync::mpsc::channel;
 #[test]
 fn test_wallet_request_airdrop() {
     let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_request_airdrop");
-
+    let server_exit = server.run(None);
     let (sender, receiver) = channel();
     run_local_drone(alice, sender);
     let drone_addr = receiver.recv().unwrap();
@@ -33,6 +33,6 @@ fn test_wallet_request_airdrop() {
         .unwrap();
     assert_eq!(balance, 50);
 
-    server.close().unwrap();
+    server_exit();
     remove_dir_all(ledger_path).unwrap();
 }