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

No longer need to give new_fullnode() a random string

Browse Source
This commit is contained in:
Michael Vines
2019-02-26 19:26:42 -08:00
parent 5a7b99ecc2
commit 88ecce12a2
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/thin_client.rs
View File

@ -456,7 +456,7 @@ pub fn retry_get_balance(
None
}
pub fn new_fullnode(ledger_name: &'static str) -> (Fullnode, NodeInfo, Keypair, String) {
pub fn new_fullnode() -> (Fullnode, NodeInfo, Keypair, String) {
use crate::blocktree::create_new_tmp_ledger;
use crate::cluster_info::Node;
use crate::fullnode::Fullnode;
@ -469,7 +469,7 @@ pub fn new_fullnode(ledger_name: &'static str) -> (Fullnode, NodeInfo, Keypair,
let node_info = node.info.clone();
let (genesis_block, mint_keypair) = GenesisBlock::new_with_leader(10_000, node_info.id, 42);
let (ledger_path, _last_id) = create_new_tmp_ledger(ledger_name, &genesis_block).unwrap();
let (ledger_path, _last_id) = create_new_tmp_ledger!(&genesis_block).unwrap();
let vote_account_keypair = Arc::new(Keypair::new());
let voting_keypair = VotingKeypair::new_local(&vote_account_keypair);
@ -498,7 +498,7 @@ mod tests {
#[test]
fn test_thin_client_basic() {
solana_logger::setup();
let (server, leader_data, alice, ledger_path) = new_fullnode("test_thin_client_basic");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let bob_pubkey = Keypair::new().pubkey();
@ -532,7 +532,7 @@ mod tests {
#[ignore]
fn test_bad_sig() {
solana_logger::setup();
let (server, leader_data, alice, ledger_path) = new_fullnode("bad_sig");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let bob_pubkey = Keypair::new().pubkey();
info!(
@ -568,7 +568,7 @@ mod tests {
#[test]
fn test_register_vote_account() {
solana_logger::setup();
let (server, leader_data, alice, ledger_path) = new_fullnode("test_register_vote_account");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
info!(
"found leader: {:?}",
@ -637,8 +637,7 @@ mod tests {
#[test]
fn test_zero_balance_after_nonzero() {
solana_logger::setup();
let (server, leader_data, alice, ledger_path) =
new_fullnode("test_zero_balance_after_nonzero");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let bob_keypair = Keypair::new();

2
tests/rpc.rs
View File

@ -16,7 +16,7 @@ use std::time::Duration;
fn test_rpc_send_tx() {
solana_logger::setup();
let (server, leader_data, alice, ledger_path) = new_fullnode("test_rpc_send_tx");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let bob_pubkey = Keypair::new().pubkey();

2
wallet/tests/deploy.rs
View File

@ -19,7 +19,7 @@ fn test_wallet_deploy_program() {
pathbuf.push("noop");
pathbuf.set_extension("so");
let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_deploy_program");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let (sender, receiver) = channel();

6
wallet/tests/pay.rs
View File

@ -20,7 +20,7 @@ fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: Pubkey) {
#[test]
fn test_wallet_timestamp_tx() {
let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_timestamp_tx");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let bob_pubkey = Keypair::new().pubkey();
@ -81,7 +81,7 @@ fn test_wallet_timestamp_tx() {
#[test]
fn test_wallet_witness_tx() {
let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_witness_tx");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let bob_pubkey = Keypair::new().pubkey();
@ -139,7 +139,7 @@ fn test_wallet_witness_tx() {
#[test]
fn test_wallet_cancel_tx() {
let (server, leader_data, alice, ledger_path) = new_fullnode("test_wallet_cancel_tx");
let (server, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let bob_pubkey = Keypair::new().pubkey();

2
wallet/tests/request_airdrop.rs
View File

@ -8,7 +8,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, leader_data, alice, ledger_path) = new_fullnode();
let server_exit = server.run(None);
let (sender, receiver) = channel();
run_local_drone(alice, sender);