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

Cleanup stragglers from move-to-transfer rename (#3947)

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-04-23 13:30:42 -06:00
committed by GitHub
parent 7372ec9e1a
commit 29698fcd38
9 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
programs/config_api/src/config_processor.rs
View File

@ -158,7 +158,8 @@ mod tests {
bank.transfer(42, &mint_keypair, &system_pubkey).unwrap();
let (bank_client, from_keypair, config_keypair) = create_config_client(bank, mint_keypair);
let move_instruction = system_instruction::transfer(&system_pubkey, &Pubkey::default(), 42);
let transfer_instruction =
system_instruction::transfer(&system_pubkey, &Pubkey::default(), 42);
let my_config = MyConfig::new(42);
let mut store_instruction =
config_instruction::store(&from_keypair.pubkey(), &config_keypair.pubkey(), &my_config);
@ -166,7 +167,7 @@ mod tests {
store_instruction.accounts[1].is_signer = false;
// Don't sign the transaction with `config_client`
let message = Message::new(vec![move_instruction, store_instruction]);
let message = Message::new(vec![transfer_instruction, store_instruction]);
bank_client
.send_message(&[&system_keypair], message)
.unwrap_err();

4
programs/vote_api/src/vote_instruction.rs
View File

@ -202,8 +202,8 @@ mod tests {
// Sneak in an instruction so that the transaction is signed but
// the 0th account in the second instruction is not! The program
// needs to check that it's signed.
let move_ix = system_instruction::transfer(&mallory_id, &vote_id, 1);
let message = Message::new(vec![move_ix, vote_ix]);
let transfer_ix = system_instruction::transfer(&mallory_id, &vote_id, 1);
let message = Message::new(vec![transfer_ix, vote_ix]);
let result = bank_client.send_message(&[&mallory_keypair], message);
// And ensure there's no vote.