Replaces assert_eq! in native programs by explicit if and panic!.

solana-labs · Mar 2, 2021 · 47625d8 · 47625d8
1 parent 4f27d01
commit 47625d8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 17 deletions.
diff --git a/programs/budget/src/budget_processor.rs b/programs/budget/src/budget_processor.rs
@@ -115,12 +115,15 @@ fn apply_account_data(
 
 pub fn process_instruction(
     _program_id: &Pubkey,
-    keyed_accounts: &[KeyedAccount],
+    _keyed_accounts: &[KeyedAccount],
     data: &[u8],
     invoke_context: &mut dyn InvokeContext,
 ) -> Result<(), InstructionError> {
+    let keyed_accounts = invoke_context.get_keyed_accounts();
     // TODO [KeyedAccounts to InvokeContext refactoring]
-    assert_eq!(keyed_accounts, invoke_context.get_keyed_accounts());
+    if invoke_context.get_keyed_accounts() != keyed_accounts {
+        panic!();
+    }
 
     let instruction = limited_deserialize(data)?;
 

diff --git a/programs/config/src/config_processor.rs b/programs/config/src/config_processor.rs
@@ -13,12 +13,15 @@ use solana_sdk::{
 
 pub fn process_instruction(
     _program_id: &Pubkey,
-    keyed_accounts: &[KeyedAccount],
+    _keyed_accounts: &[KeyedAccount],
     data: &[u8],
     invoke_context: &mut dyn InvokeContext,
 ) -> Result<(), InstructionError> {
+    let keyed_accounts = invoke_context.get_keyed_accounts();
     // TODO [KeyedAccounts to InvokeContext refactoring]
-    assert_eq!(keyed_accounts, invoke_context.get_keyed_accounts());
+    if invoke_context.get_keyed_accounts() != keyed_accounts {
+        panic!();
+    }
 
     let key_list: ConfigKeys = limited_deserialize(data)?;
     let config_keyed_account = &mut keyed_account_at_index(keyed_accounts, 0)?;

diff --git a/programs/exchange/src/exchange_processor.rs b/programs/exchange/src/exchange_processor.rs
@@ -462,14 +462,17 @@ impl ExchangeProcessor {
 
 pub fn process_instruction(
     _program_id: &Pubkey,
-    keyed_accounts: &[KeyedAccount],
+    _keyed_accounts: &[KeyedAccount],
     data: &[u8],
     invoke_context: &mut dyn InvokeContext,
 ) -> Result<(), InstructionError> {
     solana_logger::setup();
 
+    let keyed_accounts = invoke_context.get_keyed_accounts();
     // TODO [KeyedAccounts to InvokeContext refactoring]
-    assert_eq!(keyed_accounts, invoke_context.get_keyed_accounts());
+    if invoke_context.get_keyed_accounts() != keyed_accounts {
+        panic!();
+    }
 
     match limited_deserialize::<ExchangeInstruction>(data)? {
         ExchangeInstruction::AccountRequest => {

diff --git a/programs/noop/src/lib.rs b/programs/noop/src/lib.rs
@@ -14,11 +14,9 @@ pub fn process_instruction(
     program_id: &Pubkey,
     keyed_accounts: &[KeyedAccount],
     data: &[u8],
-    invoke_context: &mut dyn InvokeContext,
+    _invoke_context: &mut dyn InvokeContext,
 ) -> Result<(), InstructionError> {
     solana_logger::setup();
-    // TODO [KeyedAccounts to InvokeContext refactoring]
-    assert_eq!(keyed_accounts, invoke_context.get_keyed_accounts());
     trace!("noop: program_id: {:?}", program_id);
     trace!("noop: keyed_accounts: {:#?}", keyed_accounts);
     trace!("noop: data: {:?}", data);

diff --git a/programs/ownable/src/ownable_processor.rs b/programs/ownable/src/ownable_processor.rs
@@ -29,12 +29,15 @@ fn set_owner(
 
 pub fn process_instruction(
     _program_id: &Pubkey,
-    keyed_accounts: &[KeyedAccount],
+    _keyed_accounts: &[KeyedAccount],
     data: &[u8],
     invoke_context: &mut dyn InvokeContext,
 ) -> Result<(), InstructionError> {
+    let keyed_accounts = invoke_context.get_keyed_accounts();
     // TODO [KeyedAccounts to InvokeContext refactoring]
-    assert_eq!(keyed_accounts, invoke_context.get_keyed_accounts());
+    if invoke_context.get_keyed_accounts() != keyed_accounts {
+        panic!();
+    }
     let new_owner_pubkey: Pubkey = limited_deserialize(data)?;
     let account_keyed_account = &mut keyed_account_at_index(keyed_accounts, 0)?;
     let mut account_owner_pubkey: Pubkey =

diff --git a/programs/stake/src/stake_instruction.rs b/programs/stake/src/stake_instruction.rs
@@ -483,12 +483,15 @@ pub fn set_lockup(
 
 pub fn process_instruction(
     _program_id: &Pubkey,
-    keyed_accounts: &[KeyedAccount],
+    _keyed_accounts: &[KeyedAccount],
     data: &[u8],
     invoke_context: &mut dyn InvokeContext,
 ) -> Result<(), InstructionError> {
+    let keyed_accounts = invoke_context.get_keyed_accounts();
     // TODO [KeyedAccounts to InvokeContext refactoring]
-    assert_eq!(keyed_accounts, invoke_context.get_keyed_accounts());
+    if invoke_context.get_keyed_accounts() != keyed_accounts {
+        panic!();
+    }
     trace!("process_instruction: {:?}", data);
     trace!("keyed_accounts: {:?}", keyed_accounts);
 

diff --git a/programs/vest/src/vest_processor.rs b/programs/vest/src/vest_processor.rs
@@ -59,12 +59,15 @@ fn verify_signed_account<'a>(
 
 pub fn process_instruction(
     _program_id: &Pubkey,
-    keyed_accounts: &[KeyedAccount],
+    _keyed_accounts: &[KeyedAccount],
     data: &[u8],
     invoke_context: &mut dyn InvokeContext,
 ) -> Result<(), InstructionError> {
+    let keyed_accounts = invoke_context.get_keyed_accounts();
     // TODO [KeyedAccounts to InvokeContext refactoring]
-    assert_eq!(keyed_accounts, invoke_context.get_keyed_accounts());
+    if invoke_context.get_keyed_accounts() != keyed_accounts {
+        panic!();
+    }
 
     let contract_account = &mut keyed_account_at_index(keyed_accounts, 0)?.try_account_ref_mut()?;
     if invoke_context.is_feature_active(&feature_set::check_program_owner::id())

diff --git a/programs/vote/src/vote_instruction.rs b/programs/vote/src/vote_instruction.rs
@@ -277,12 +277,15 @@ fn verify_rent_exemption(
 
 pub fn process_instruction(
     _program_id: &Pubkey,
-    keyed_accounts: &[KeyedAccount],
+    _keyed_accounts: &[KeyedAccount],
     data: &[u8],
     invoke_context: &mut dyn InvokeContext,
 ) -> Result<(), InstructionError> {
+    let keyed_accounts = invoke_context.get_keyed_accounts();
     // TODO [KeyedAccounts to InvokeContext refactoring]
-    assert_eq!(keyed_accounts, invoke_context.get_keyed_accounts());
+    if invoke_context.get_keyed_accounts() != keyed_accounts {
+        panic!();
+    }
 
     trace!("process_instruction: {:?}", data);
     trace!("keyed_accounts: {:?}", keyed_accounts);