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

Punt on the Script abstraction

Browse Source 
Low ROI
This commit is contained in:
Greg Fitzgerald
2019-03-23 05:15:15 -06:00
parent c49e84c75b
commit b53cbdd9e6
17 changed files with 166 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/src/bank_client.rs
View File

@ -1,7 +1,6 @@
use crate::bank::Bank;
use solana_sdk::instruction::Instruction;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::script::Script;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction::SystemInstruction;
use solana_sdk::transaction::{Transaction, TransactionError};
@ -39,17 +38,12 @@ impl<'a> BankClient<'a> {
self.bank.process_transaction(&tx)
}
/// Create and process a transaction.
pub fn process_script(&self, script: Script) -> Result<(), TransactionError> {
self.process_transaction(script.compile())
}
/// Create and process a transaction from a list of instructions.
pub fn process_instructions(
&self,
instructions: Vec<Instruction>,
) -> Result<(), TransactionError> {
self.process_script(Script::new(instructions))
self.process_transaction(Transaction::new(instructions))
}
/// Create and process a transaction from a single instruction.

7
runtime/src/system_program.rs
View File

@ -109,7 +109,6 @@ mod tests {
use solana_sdk::account::Account;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::instruction::{AccountMeta, Instruction, InstructionError};
use solana_sdk::script::Script;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction::SystemInstruction;
use solana_sdk::system_program;
@ -296,13 +295,13 @@ mod tests {
AccountMeta::new(alice_pubkey, false),
AccountMeta::new(mallory_pubkey, true),
];
let malicious_script = Script::new(vec![Instruction::new(
let malicious_instruction = Instruction::new(
system_program::id(),
&SystemInstruction::Move { lamports: 10 },
account_metas,
)]);
);
assert_eq!(
mallory_client.process_script(malicious_script),
mallory_client.process_instruction(malicious_instruction),
Err(TransactionError::InstructionError(
0,
InstructionError::MissingRequiredSignature