瀏覽代碼

Add optional FeatureSet arg to `Bank::new_from_fields()` (#6399)

fuzz: add FeatureSet optional argument for Bank::new_from_fields()
mjain-jump 5 月之前
父節點
當前提交
2441e6468c
共有 2 個文件被更改,包括 6 次插入0 次删除
  1. 4 0
      runtime/src/bank.rs
  2. 2 0
      runtime/src/serde_snapshot.rs

+ 4 - 0
runtime/src/bank.rs

@@ -1787,6 +1787,7 @@ impl Bank {
         additional_builtins: Option<&[BuiltinPrototype]>,
         debug_do_not_add_builtins: bool,
         accounts_data_size_initial: u64,
+        #[cfg(feature = "dev-context-only-utils")] feature_set: Option<FeatureSet>,
     ) -> Self {
         let now = Instant::now();
         let ancestors = Ancestors::from(&fields.ancestors);
@@ -1859,6 +1860,9 @@ impl Bank {
             transaction_log_collector_config: Arc::<RwLock<TransactionLogCollectorConfig>>::default(
             ),
             transaction_log_collector: Arc::<RwLock<TransactionLogCollector>>::default(),
+            #[cfg(feature = "dev-context-only-utils")]
+            feature_set: Arc::new(feature_set.unwrap_or_default()),
+            #[cfg(not(feature = "dev-context-only-utils"))]
             feature_set: Arc::<FeatureSet>::default(),
             reserved_account_keys: Arc::<ReservedAccountKeys>::default(),
             drop_callback: RwLock::new(OptionalDropCallback(None)),

+ 2 - 0
runtime/src/serde_snapshot.rs

@@ -898,6 +898,8 @@ where
         additional_builtins,
         debug_do_not_add_builtins,
         reconstructed_accounts_db_info.accounts_data_len,
+        #[cfg(feature = "dev-context-only-utils")]
+        None,
     );
 
     info!("rent_collector: {:?}", bank.rent_collector());