Revert "fix account resize test by requesting max tx data size (#28826)"

This reverts commit ae48ac9.
solana-labs · Jan 13, 2023 · 1543a27 · 1543a27
1 parent 064f163
commit 1543a27
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/program-runtime/src/compute_budget.rs b/program-runtime/src/compute_budget.rs
@@ -25,7 +25,7 @@ pub enum LoadedAccountsDataLimitType {
 
 /// Get default value of `ComputeBudget::accounts_data_size_limit` if not set specifically. It
 /// sets to 10MB initially, may be changed with feature gate.
-const DEFAULT_LOADED_ACCOUNTS_DATA_LIMIT: u32 = 10 * 1024 * 1024;
+const DEFAULT_LOADED_ACCOUNTS_DATA_LIMIT: u32 = 10_000_000;
 pub fn get_default_loaded_accounts_data_limit(limit_type: &LoadedAccountsDataLimitType) -> u32 {
     match limit_type {
         LoadedAccountsDataLimitType::V0 => DEFAULT_LOADED_ACCOUNTS_DATA_LIMIT,
@@ -34,7 +34,7 @@ pub fn get_default_loaded_accounts_data_limit(limit_type: &LoadedAccountsDataLim
 /// Get max value of `ComputeBudget::accounts_data_size_limit`, it caps value user
 /// sets via `ComputeBudgetInstruction::set_compute_unit_limit`. It is set to 100MB
 /// initially, can be changed with feature gate.
-const MAX_LOADED_ACCOUNTS_DATA_LIMIT: u32 = 100 * 1024 * 1024;
+const MAX_LOADED_ACCOUNTS_DATA_LIMIT: u32 = 100_000_000;
 pub fn get_max_loaded_accounts_data_limit(limit_type: &LoadedAccountsDataLimitType) -> u32 {
     match limit_type {
         LoadedAccountsDataLimitType::V0 => MAX_LOADED_ACCOUNTS_DATA_LIMIT,

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -19670,10 +19670,7 @@ pub(crate) mod tests {
             account_metas,
         );
         Transaction::new_signed_with_payer(
-            &[
-                instruction,
-                ComputeBudgetInstruction::set_accounts_data_size_limit(u32::MAX),
-            ],
+            &[instruction],
             Some(&payer.pubkey()),
             &[payer],
             recent_blockhash,
@@ -19975,7 +19972,6 @@ pub(crate) mod tests {
             &mock_program_id,
             mock_realloc_process_instruction,
         );
-
         let recent_blockhash = bank.last_blockhash();
 
         let funding_keypair = Keypair::new();
@@ -19992,7 +19988,7 @@ pub(crate) mod tests {
             let account_balance = LAMPORTS_PER_SOL;
             let account_size = rng.gen_range(
                 1,
-                MAX_PERMITTED_DATA_LENGTH as usize - MAX_PERMITTED_DATA_INCREASE,
+                (MAX_PERMITTED_DATA_LENGTH / 4) as usize - MAX_PERMITTED_DATA_INCREASE,
             );
             let account_data =
                 AccountSharedData::new(account_balance, account_size, &mock_program_id);
@@ -20022,8 +20018,9 @@ pub(crate) mod tests {
         {
             let account_pubkey = Pubkey::new_unique();
             let account_balance = LAMPORTS_PER_SOL;
-            let account_size =
-                rng.gen_range(MAX_PERMITTED_DATA_LENGTH / 2, MAX_PERMITTED_DATA_LENGTH) as usize;
+            let account_size = rng
+                .gen_range(MAX_PERMITTED_DATA_LENGTH / 8, MAX_PERMITTED_DATA_LENGTH / 4)
+                as usize;
             let account_data =
                 AccountSharedData::new(account_balance, account_size, &mock_program_id);
             bank.store_account(&account_pubkey, &account_data);