Do not check accounts data size in InvokeContext

solana-labs · Jul 14, 2022 · b43ac4f · b43ac4f
1 parent 4f71ae6
commit b43ac4f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/program-runtime/src/accounts_data_meter.rs b/program-runtime/src/accounts_data_meter.rs
@@ -26,13 +26,11 @@ impl AccountsDataMeter {
     /// Make a new AccountsDataMeter
     #[must_use]
     pub fn new(initial_accounts_data_len: u64) -> Self {
-        let accounts_data_meter = Self {
+        Self {
             maximum: MAX_ACCOUNTS_DATA_LEN,
             initial: initial_accounts_data_len,
             delta: 0,
-        };
-        debug_assert!(accounts_data_meter.initial <= accounts_data_meter.maximum);
-        accounts_data_meter
+        }
     }
 
     /// Return the maximum amount of accounts data space that can be used (in bytes)

diff --git a/program-runtime/src/invoke_context.rs b/program-runtime/src/invoke_context.rs
@@ -15,9 +15,7 @@ use {
     solana_sdk::{
         account::{AccountSharedData, ReadableAccount},
         bpf_loader_upgradeable::{self, UpgradeableLoaderState},
-        feature_set::{
-            cap_accounts_data_len, record_instruction_in_transaction_context_push, FeatureSet,
-        },
+        feature_set::{record_instruction_in_transaction_context_push, FeatureSet},
         hash::Hash,
         instruction::{AccountMeta, Instruction, InstructionError},
         native_loader,
@@ -463,7 +461,6 @@ impl<'a> InvokeContext<'a> {
         instruction_accounts: &[InstructionAccount],
         program_indices: &[usize],
     ) -> Result<(), InstructionError> {
-        let cap_accounts_data_len = self.feature_set.is_active(&cap_accounts_data_len::id());
         let instruction_context = self
             .transaction_context
             .get_current_instruction_context()
@@ -534,12 +531,8 @@ impl<'a> InvokeContext<'a> {
             let pre_data_len = pre_account.data().len() as i64;
             let post_data_len = account.data().len() as i64;
             let data_len_delta = post_data_len.saturating_sub(pre_data_len);
-            if cap_accounts_data_len {
-                self.accounts_data_meter.adjust_delta(data_len_delta)?;
-            } else {
-                self.accounts_data_meter
-                    .adjust_delta_unchecked(data_len_delta);
-            }
+            self.accounts_data_meter
+                .adjust_delta_unchecked(data_len_delta);
         }
 
         // Verify that the total sum of all the lamports did not change
@@ -558,7 +551,6 @@ impl<'a> InvokeContext<'a> {
         instruction_accounts: &[InstructionAccount],
         before_instruction_context_push: bool,
     ) -> Result<(), InstructionError> {
-        let cap_accounts_data_len = self.feature_set.is_active(&cap_accounts_data_len::id());
         let transaction_context = &self.transaction_context;
         let instruction_context = transaction_context.get_current_instruction_context()?;
         let program_id = instruction_context
@@ -627,12 +619,8 @@ impl<'a> InvokeContext<'a> {
                         let pre_data_len = pre_account.data().len() as i64;
                         let post_data_len = account.data().len() as i64;
                         let data_len_delta = post_data_len.saturating_sub(pre_data_len);
-                        if cap_accounts_data_len {
-                            self.accounts_data_meter.adjust_delta(data_len_delta)?;
-                        } else {
-                            self.accounts_data_meter
-                                .adjust_delta_unchecked(data_len_delta);
-                        }
+                        self.accounts_data_meter
+                            .adjust_delta_unchecked(data_len_delta);
 
                         break;
                     }