Revert "add filler accounts to bloat validator and predict failure (s…

…olana-labs#20491)" This reverts commit 9f04d7f.
identity-com · Nov 24, 2021 · 426b2a9 · 426b2a9
1 parent 6aa073f
commit 426b2a9
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 303 deletions.
diff --git a/core/src/accounts_hash_verifier.rs b/core/src/accounts_hash_verifier.rs
@@ -134,7 +134,6 @@ impl AccountsHashVerifier {
                 HashStats::default(),
                 false,
                 None,
-                None, // this will fail with filler accounts
             )
             .unwrap();
 

diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
@@ -893,12 +893,6 @@ fn main() {
         .validator(is_parsable::<usize>)
         .takes_value(true)
         .help("How much memory the accounts index can consume. If this is exceeded, some account index entries will be stored on disk. If missing, the entire index is stored in memory.");
-    let accounts_filler_count = Arg::with_name("accounts_filler_count")
-        .long("accounts-filler-count")
-        .value_name("COUNT")
-        .validator(is_parsable::<usize>)
-        .takes_value(true)
-        .help("How many accounts to add to stress the system. Accounts are ignored in operations related to correctness.");
     let account_paths_arg = Arg::with_name("account_paths")
         .long("accounts")
         .value_name("PATHS")
@@ -1223,7 +1217,6 @@ fn main() {
             .arg(&limit_load_slot_count_from_snapshot_arg)
             .arg(&accounts_index_bins)
             .arg(&accounts_index_limit)
-            .arg(&accounts_filler_count)
             .arg(&verify_index_arg)
             .arg(&hard_forks_arg)
             .arg(&no_accounts_db_caching_arg)
@@ -1968,12 +1961,9 @@ fn main() {
                 accounts_index_config.drives = Some(accounts_index_paths);
             }
 
-            let filler_account_count = value_t!(arg_matches, "accounts_filler_count", usize).ok();
-
             let accounts_db_config = Some(AccountsDbConfig {
                 index: Some(accounts_index_config),
                 accounts_hash_cache_path: Some(ledger_path.clone()),
-                filler_account_count,
             });
 
             let process_options = ProcessOptions {

diff --git a/ledger/src/bank_forks_utils.rs b/ledger/src/bank_forks_utils.rs
@@ -97,16 +97,6 @@ pub fn load(
         info!("Snapshots disabled; will load from genesis");
     }
 
-    if process_options
-        .accounts_db_config
-        .as_ref()
-        .and_then(|config| config.filler_account_count)
-        .unwrap_or_default()
-        > 0
-    {
-        panic!("filler accounts specified, but not loading from snapshot");
-    }
-
     load_from_genesis(
         genesis_config,
         blockstore,

diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs
@@ -273,7 +273,6 @@ impl Accounts {
                                         key,
                                         &mut account,
                                         rent_for_sysvars,
-                                        self.accounts_db.filler_account_suffix.as_ref(),
                                     );
                                     (account, rent_due)
                                 } else {
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,7 +134,6 @@ impl AccountsHashVerifier { @@
                     HashStats::default(),
                     false,
                     None,
-                    None, // this will fail with filler accounts
                 )
                 .unwrap();
@@ Expand Down @@