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

Purge remaining last_id (now called block_hash)

Browse Source
This commit is contained in:
Michael Vines
2019-03-02 10:09:09 -08:00
committed by Greg Fitzgerald
parent 2bfad87a5f
commit 258cf21416
39 changed files with 369 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/replicator.rs
View File

@@ -44,7 +44,7 @@ fn test_replicator_startup_basic() {
let (genesis_block, mint_keypair) =
GenesisBlock::new_with_leader(1_000_000_000, leader_info.id, 42);
let (leader_ledger_path, _last_id) = create_new_tmp_ledger!(&genesis_block);
let (leader_ledger_path, _block_hash) = create_new_tmp_ledger!(&genesis_block);
let validator_ledger_path = tmp_copy_blocktree!(&leader_ledger_path);
@@ -72,11 +72,11 @@ fn test_replicator_startup_basic() {
let voting_keypair = VotingKeypair::new_local(&validator_keypair);
let mut leader_client = mk_client(&leader_info);
let last_id = leader_client.get_recent_block_hash();
debug!("last_id: {:?}", last_id);
let block_hash = leader_client.get_recent_block_hash();
debug!("block_hash: {:?}", block_hash);
leader_client
.transfer(10, &mint_keypair, validator_keypair.pubkey(), &last_id)
.transfer(10, &mint_keypair, validator_keypair.pubkey(), &block_hash)
.unwrap();
let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey());
@@ -98,9 +98,9 @@ fn test_replicator_startup_basic() {
info!("starting transfers..");
for i in 0..64 {
debug!("transfer {}", i);
let last_id = leader_client.get_recent_block_hash();
let block_hash = leader_client.get_recent_block_hash();
let mut transaction =
SystemTransaction::new_account(&mint_keypair, bob.pubkey(), 1, last_id, 0);
SystemTransaction::new_account(&mint_keypair, bob.pubkey(), 1, block_hash, 0);
leader_client
.retry_transfer(&mint_keypair, &mut transaction, 5)
.unwrap();
@@ -116,13 +116,13 @@ fn test_replicator_startup_basic() {
info!("giving replicator tokens..");
let last_id = leader_client.get_recent_block_hash();
let block_hash = leader_client.get_recent_block_hash();
// Give the replicator some tokens
let mut tx = SystemTransaction::new_account(
&mint_keypair,
replicator_keypair.pubkey(),
1,
last_id,
block_hash,
0,
);
leader_client
@@ -238,7 +238,7 @@ fn test_replicator_startup_leader_hang() {
let leader_ledger_path = "replicator_test_leader_ledger";
let (genesis_block, _mint_keypair) = GenesisBlock::new(10_000);
let (replicator_ledger_path, _last_id) = create_new_tmp_ledger!(&genesis_block);
let (replicator_ledger_path, _block_hash) = create_new_tmp_ledger!(&genesis_block);
{
let replicator_keypair = Keypair::new();
@@ -275,13 +275,13 @@ fn test_replicator_startup_ledger_hang() {
let (genesis_block, _mint_keypair) =
GenesisBlock::new_with_leader(100, leader_keypair.pubkey(), 42);
let (replicator_ledger_path, _last_id) = create_new_tmp_ledger!(&genesis_block);
let (replicator_ledger_path, _block_hash) = create_new_tmp_ledger!(&genesis_block);
info!("starting leader node");
let leader_node = Node::new_localhost_with_pubkey(leader_keypair.pubkey());
let leader_info = leader_node.info.clone();
let (leader_ledger_path, _last_id) = create_new_tmp_ledger!(&genesis_block);
let (leader_ledger_path, _block_hash) = create_new_tmp_ledger!(&genesis_block);
let validator_ledger_path = tmp_copy_blocktree!(&leader_ledger_path);
{

8
tests/rpc.rs
View File

@@ -36,13 +36,13 @@ fn test_rpc_send_tx() {
.send()
.unwrap();
let json: Value = serde_json::from_str(&response.text().unwrap()).unwrap();
let last_id_vec = bs58::decode(json["result"].as_str().unwrap())
let block_hash_vec = bs58::decode(json["result"].as_str().unwrap())
.into_vec()
.unwrap();
let last_id = Hash::new(&last_id_vec);
let block_hash = Hash::new(&block_hash_vec);
info!("last_id: {:?}", last_id);
let tx = SystemTransaction::new_move(&alice, bob_pubkey, 20, last_id, 0);
info!("block_hash: {:?}", block_hash);
let tx = SystemTransaction::new_move(&alice, bob_pubkey, 20, block_hash, 0);
let serial_tx = serialize(&tx).unwrap();
let client = reqwest::Client::new();

6
tests/tvu.rs
View File

@@ -86,7 +86,7 @@ fn test_replay() {
let tvu_addr = target1.info.tvu;
let bank = Bank::new(&genesis_block);
let last_id = bank.last_block_hash();
let block_hash = bank.last_block_hash();
let bank_forks = BankForks::new(0, bank);
let bank_forks_info = vec![BankForksInfo {
bank_id: 0,
@@ -138,7 +138,7 @@ fn test_replay() {
let num_transfers = 10;
let mut transfer_amount = 501;
let bob_keypair = Keypair::new();
let mut cur_hash = last_id;
let mut cur_hash = block_hash;
for i in 0..num_transfers {
let entry0 = next_entry_mut(&mut cur_hash, i, vec![]);
let entry_tick0 = next_entry_mut(&mut cur_hash, i + 1, vec![]);
@@ -147,7 +147,7 @@ fn test_replay() {
&mint_keypair,
bob_keypair.pubkey(),
transfer_amount,
last_id,
block_hash,
0,
);
let entry_tick1 = next_entry_mut(&mut cur_hash, i + 1, vec![]);