fix benches
This commit is contained in:
		
				
					committed by
					
						
						Greg Fitzgerald
					
				
			
			
				
	
			
			
			
						parent
						
							93c4f6c9b8
						
					
				
				
					commit
					25edb9e447
				
			@@ -10,6 +10,7 @@ use solana::bank::*;
 | 
			
		||||
use solana::hash::hash;
 | 
			
		||||
use solana::mint::Mint;
 | 
			
		||||
use solana::signature::{Keypair, KeypairUtil};
 | 
			
		||||
use solana::system_transaction::SystemTransaction;
 | 
			
		||||
use solana::transaction::Transaction;
 | 
			
		||||
use test::Bencher;
 | 
			
		||||
 | 
			
		||||
@@ -24,7 +25,13 @@ fn bench_process_transaction(bencher: &mut Bencher) {
 | 
			
		||||
        .map(|i| {
 | 
			
		||||
            // Seed the 'from' account.
 | 
			
		||||
            let rando0 = Keypair::new();
 | 
			
		||||
            let tx = Transaction::new(&mint.keypair(), rando0.pubkey(), 10_000, mint.last_id());
 | 
			
		||||
            let tx = Transaction::system_move(
 | 
			
		||||
                &mint.keypair(),
 | 
			
		||||
                rando0.pubkey(),
 | 
			
		||||
                10_000,
 | 
			
		||||
                mint.last_id(),
 | 
			
		||||
                0,
 | 
			
		||||
            );
 | 
			
		||||
            assert!(bank.process_transaction(&tx).is_ok());
 | 
			
		||||
 | 
			
		||||
            // Seed the 'to' account and a cell for its signature.
 | 
			
		||||
@@ -32,7 +39,7 @@ fn bench_process_transaction(bencher: &mut Bencher) {
 | 
			
		||||
            bank.register_entry_id(&last_id);
 | 
			
		||||
 | 
			
		||||
            let rando1 = Keypair::new();
 | 
			
		||||
            let tx = Transaction::new(&rando0, rando1.pubkey(), 1, last_id);
 | 
			
		||||
            let tx = Transaction::system_move(&rando0, rando1.pubkey(), 1, last_id, 0);
 | 
			
		||||
            assert!(bank.process_transaction(&tx).is_ok());
 | 
			
		||||
 | 
			
		||||
            // Finally, return the transaction to the benchmark.
 | 
			
		||||
 
 | 
			
		||||
@@ -13,6 +13,7 @@ use solana::entry::Entry;
 | 
			
		||||
use solana::mint::Mint;
 | 
			
		||||
use solana::packet::{to_packets_chunked, PacketRecycler};
 | 
			
		||||
use solana::signature::{KeypairUtil, Pubkey, Signature};
 | 
			
		||||
use solana::system_transaction::SystemTransaction;
 | 
			
		||||
use solana::transaction::Transaction;
 | 
			
		||||
use std::iter;
 | 
			
		||||
use std::sync::mpsc::{channel, Receiver};
 | 
			
		||||
@@ -47,7 +48,13 @@ fn bench_banking_stage_multi_accounts(bencher: &mut Bencher) {
 | 
			
		||||
    let (verified_sender, verified_receiver) = channel();
 | 
			
		||||
    let packet_recycler = PacketRecycler::default();
 | 
			
		||||
    let bank = Arc::new(Bank::new(&mint));
 | 
			
		||||
    let dummy = Transaction::new(&mint.keypair(), mint.keypair().pubkey(), 1, mint.last_id());
 | 
			
		||||
    let dummy = Transaction::system_move(
 | 
			
		||||
        &mint.keypair(),
 | 
			
		||||
        mint.keypair().pubkey(),
 | 
			
		||||
        1,
 | 
			
		||||
        mint.last_id(),
 | 
			
		||||
        0,
 | 
			
		||||
    );
 | 
			
		||||
    let transactions: Vec<_> = (0..txes)
 | 
			
		||||
        .into_par_iter()
 | 
			
		||||
        .map(|_| {
 | 
			
		||||
@@ -62,11 +69,12 @@ fn bench_banking_stage_multi_accounts(bencher: &mut Bencher) {
 | 
			
		||||
        }).collect();
 | 
			
		||||
    // fund all the accounts
 | 
			
		||||
    transactions.iter().for_each(|tx| {
 | 
			
		||||
        let fund = Transaction::new(
 | 
			
		||||
        let fund = Transaction::system_move(
 | 
			
		||||
            &mint.keypair(),
 | 
			
		||||
            tx.keys[0],
 | 
			
		||||
            mint_total / txes as i64,
 | 
			
		||||
            mint.last_id(),
 | 
			
		||||
            0,
 | 
			
		||||
        );
 | 
			
		||||
        assert!(bank.process_transaction(&fund).is_ok());
 | 
			
		||||
    });
 | 
			
		||||
 
 | 
			
		||||
@@ -6,6 +6,7 @@ use solana::hash::{hash, Hash};
 | 
			
		||||
use solana::ledger::{next_entries, reconstruct_entries_from_blobs, Block};
 | 
			
		||||
use solana::packet::BlobRecycler;
 | 
			
		||||
use solana::signature::{Keypair, KeypairUtil};
 | 
			
		||||
use solana::system_transaction::SystemTransaction;
 | 
			
		||||
use solana::transaction::Transaction;
 | 
			
		||||
use test::Bencher;
 | 
			
		||||
 | 
			
		||||
@@ -14,7 +15,7 @@ fn bench_block_to_blobs_to_block(bencher: &mut Bencher) {
 | 
			
		||||
    let zero = Hash::default();
 | 
			
		||||
    let one = hash(&zero.as_ref());
 | 
			
		||||
    let keypair = Keypair::new();
 | 
			
		||||
    let tx0 = Transaction::new(&keypair, keypair.pubkey(), 1, one);
 | 
			
		||||
    let tx0 = Transaction::system_move(&keypair, keypair.pubkey(), 1, one, 0);
 | 
			
		||||
    let transactions = vec![tx0; 10];
 | 
			
		||||
    let entries = next_entries(&zero, 1, transactions);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ extern crate test;
 | 
			
		||||
 | 
			
		||||
use solana::packet::{to_packets, PacketRecycler};
 | 
			
		||||
use solana::sigverify;
 | 
			
		||||
use solana::transaction::test_tx;
 | 
			
		||||
use solana::system_transaction::test_tx;
 | 
			
		||||
use test::Bencher;
 | 
			
		||||
 | 
			
		||||
#[bench]
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user