Abandon Builder pattern

This commit is contained in:
Greg Fitzgerald
2019-03-15 10:54:56 -06:00
parent aca739b800
commit 24d9138067
10 changed files with 108 additions and 114 deletions

View File

@@ -1484,7 +1484,7 @@ mod tests {
let move_lamports = SystemInstruction::Move { lamports: 1 };
let mut tx = Transaction::new_unsigned(
let mut tx = Transaction::new_with_blockhash_and_fee(
&mint_keypair.pubkey(),
&[key.pubkey()],
&system_program::id(),

View File

@@ -5,8 +5,7 @@ use solana_sdk::native_program::ProgramError;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction::SystemInstruction;
use solana_sdk::system_program;
use solana_sdk::transaction::{Instruction, InstructionError, TransactionError};
use solana_sdk::transaction_builder::TransactionBuilder;
use solana_sdk::transaction::{Instruction, InstructionError, Transaction, TransactionError};
#[test]
fn test_system_unsigned_transaction() {
@@ -21,7 +20,7 @@ fn test_system_unsigned_transaction() {
// Fund to account to bypass AccountNotFound error
let ix = SystemInstruction::new_move(&from_pubkey, &to_pubkey, 50);
let mut tx = TransactionBuilder::new(vec![ix]).compile();
let mut tx = Transaction::new(vec![ix]);
alice_client.process_transaction(&mut tx).unwrap();
// Erroneously sign transaction with recipient account key
@@ -31,7 +30,7 @@ fn test_system_unsigned_transaction() {
&SystemInstruction::Move { lamports: 10 },
vec![(from_pubkey, false), (to_pubkey, true)],
);
let mut tx = TransactionBuilder::new(vec![ix]).compile();
let mut tx = Transaction::new(vec![ix]);
assert_eq!(
mallory_client.process_transaction(&mut tx),
Err(TransactionError::InstructionError(