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

credit_only credits forwarding (#6509)

Browse Source 
* credit_only_credits_forwarding

* whack transfer_now()

* fixup

* bench should retry the airdrop TX

* fixup

* try to make bench-exchange a bit more robust, informative
This commit is contained in:
Rob Walker
2019-10-23 22:01:22 -07:00
committed by GitHub
parent d398898c38
commit b4119c454a
30 changed files with 615 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drone/src/drone.rs
View File

@@ -121,11 +121,8 @@ impl Drone {
);
info!("Requesting airdrop of {} to {:?}", lamports, to);
let create_instruction = system_instruction::transfer_now(
&self.mint_keypair.pubkey(),
&to,
lamports,
);
let create_instruction =
system_instruction::transfer(&self.mint_keypair.pubkey(), &to, lamports);
let message = Message::new(vec![create_instruction]);
Ok(Transaction::new(&[&self.mint_keypair], message, blockhash))
} else {
@@ -411,8 +408,7 @@ mod tests {
bytes.put(&req[..]);
let keypair = Keypair::new();
let expected_instruction =
system_instruction::transfer_now(&keypair.pubkey(), &to, lamports);
let expected_instruction = system_instruction::transfer(&keypair.pubkey(), &to, lamports);
let message = Message::new(vec![expected_instruction]);
let expected_tx = Transaction::new(&[&keypair], message, blockhash);
let expected_bytes = serialize(&expected_tx).unwrap();

2
drone/src/drone_mock.rs
View File

@@ -18,7 +18,7 @@ pub fn request_airdrop_transaction(
let key = Keypair::new();
let to = Pubkey::new_rand();
let blockhash = Hash::default();
let tx = system_transaction::transfer_now(&key, &to, lamports, blockhash);
let tx = system_transaction::transfer(&key, &to, lamports, blockhash);
Ok(tx)
}
}

2
drone/tests/local-drone.rs
View File

@@ -13,7 +13,7 @@ fn test_local_drone() {
let to = Pubkey::new_rand();
let lamports = 50;
let blockhash = Hash::new(&to.as_ref());
let create_instruction = system_instruction::transfer_now(&keypair.pubkey(), &to, lamports);
let create_instruction = system_instruction::transfer(&keypair.pubkey(), &to, lamports);
let message = Message::new(vec![create_instruction]);
let expected_tx = Transaction::new(&[&keypair], message, blockhash);