From c63d854ac7a92c48dffadd3df4440a7913c46c28 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Mon, 15 Mar 2021 22:36:21 -0700 Subject: [PATCH] Switch to Instruction::new_with_bincode --- .../rust/cross-program-invocation/tests/functional.rs | 2 +- examples/rust/custom-heap/tests/functional.rs | 2 +- examples/rust/logging/tests/functional.rs | 2 +- examples/rust/sysvar/tests/functional.rs | 2 +- examples/rust/transfer-lamports/tests/functional.rs | 2 +- stake-pool/program/src/stake.rs | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/rust/cross-program-invocation/tests/functional.rs b/examples/rust/cross-program-invocation/tests/functional.rs index dc3611f4..1f5406b4 100644 --- a/examples/rust/cross-program-invocation/tests/functional.rs +++ b/examples/rust/cross-program-invocation/tests/functional.rs @@ -33,7 +33,7 @@ async fn test_cross_program_invocation() { let (mut banks_client, payer, recent_blockhash) = program_test.start().await; let mut transaction = Transaction::new_with_payer( - &[Instruction::new( + &[Instruction::new_with_bincode( program_id, &[bump_seed], vec![ diff --git a/examples/rust/custom-heap/tests/functional.rs b/examples/rust/custom-heap/tests/functional.rs index 124c0225..8d76d236 100644 --- a/examples/rust/custom-heap/tests/functional.rs +++ b/examples/rust/custom-heap/tests/functional.rs @@ -15,7 +15,7 @@ async fn test_custom_heap() { .start() .await; let mut transaction = Transaction::new_with_payer( - &[Instruction::new( + &[Instruction::new_with_bincode( program_id, &[10_u8, 11, 12, 13, 14], vec![], diff --git a/examples/rust/logging/tests/functional.rs b/examples/rust/logging/tests/functional.rs index 980ac475..fb1f18c7 100644 --- a/examples/rust/logging/tests/functional.rs +++ b/examples/rust/logging/tests/functional.rs @@ -18,7 +18,7 @@ async fn test_logging() { .start() .await; let mut transaction = Transaction::new_with_payer( - &[Instruction::new( + &[Instruction::new_with_bincode( program_id, &[10_u8, 11, 12, 13, 14], vec![AccountMeta::new(Pubkey::new_unique(), false)], diff --git a/examples/rust/sysvar/tests/functional.rs b/examples/rust/sysvar/tests/functional.rs index c90f0c94..a2c38b31 100644 --- a/examples/rust/sysvar/tests/functional.rs +++ b/examples/rust/sysvar/tests/functional.rs @@ -20,7 +20,7 @@ async fn test_sysvar() { .await; let mut transaction = Transaction::new_with_payer( - &[Instruction::new( + &[Instruction::new_with_bincode( program_id, &(), vec![ diff --git a/examples/rust/transfer-lamports/tests/functional.rs b/examples/rust/transfer-lamports/tests/functional.rs index e6d976f6..2d597923 100644 --- a/examples/rust/transfer-lamports/tests/functional.rs +++ b/examples/rust/transfer-lamports/tests/functional.rs @@ -35,7 +35,7 @@ async fn test_lamport_transfer() { let (mut banks_client, payer, recent_blockhash) = program_test.start().await; let mut transaction = Transaction::new_with_payer( - &[Instruction::new( + &[Instruction::new_with_bincode( program_id, &(), vec![ diff --git a/stake-pool/program/src/stake.rs b/stake-pool/program/src/stake.rs index 47351ff2..f8173a7f 100644 --- a/stake-pool/program/src/stake.rs +++ b/stake-pool/program/src/stake.rs @@ -406,7 +406,7 @@ pub fn split_only( AccountMeta::new_readonly(*authorized_pubkey, true), ]; - Instruction::new(id(), &StakeInstruction::Split(lamports), account_metas) + Instruction::new_with_bincode(id(), &StakeInstruction::Split(lamports), account_metas) } /// FIXME copied from the stake program @@ -422,7 +422,7 @@ pub fn authorize( AccountMeta::new_readonly(*authorized_pubkey, true), ]; - Instruction::new( + Instruction::new_with_bincode( id(), &StakeInstruction::Authorize(*new_authorized_pubkey, stake_authorize), account_metas, @@ -443,7 +443,7 @@ pub fn merge( AccountMeta::new_readonly(*authorized_pubkey, true), ]; - Instruction::new(id(), &StakeInstruction::Merge, account_metas) + Instruction::new_with_bincode(id(), &StakeInstruction::Merge, account_metas) } /// FIXME copied from the stake program @@ -468,7 +468,7 @@ pub fn create_account( /// FIXME copied from the stake program pub fn initialize(stake_pubkey: &Pubkey, authorized: &Authorized, lockup: &Lockup) -> Instruction { - Instruction::new( + Instruction::new_with_bincode( id(), &StakeInstruction::Initialize(*authorized, *lockup), vec![ @@ -492,5 +492,5 @@ pub fn delegate_stake( AccountMeta::new_readonly(Pubkey::from_str(STAKE_CONFIG).unwrap(), false), AccountMeta::new_readonly(*authorized_pubkey, true), ]; - Instruction::new(id(), &StakeInstruction::DelegateStake, account_metas) + Instruction::new_with_bincode(id(), &StakeInstruction::DelegateStake, account_metas) }