Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/src/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,6 @@ fn maybe_warp_slot(
root_bank,
&Pubkey::default(),
warp_slot,
solana_accounts_db::accounts_db::CalcAccountsHashDataSource::Storages,
));
bank_forks
.set_root(warp_slot, Some(snapshot_controller), Some(warp_slot))
Expand Down
6 changes: 1 addition & 5 deletions ledger-tool/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ use {
log::*,
serde_derive::Serialize,
solana_account::{state_traits::StateMut, AccountSharedData, ReadableAccount, WritableAccount},
solana_accounts_db::{
accounts_db::CalcAccountsHashDataSource,
accounts_index::{ScanConfig, ScanOrder},
},
solana_accounts_db::accounts_index::{ScanConfig, ScanOrder},
solana_clap_utils::{
hidden_unless_forced,
input_parsers::{cluster_type_of, pubkey_of, pubkeys_of},
Expand Down Expand Up @@ -2381,7 +2378,6 @@ fn main() {
bank.clone(),
bank.collector_id(),
warp_slot,
CalcAccountsHashDataSource::Storages,
))
} else {
bank
Expand Down
2 changes: 0 additions & 2 deletions program-test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1159,8 +1159,6 @@ impl ProgramTestContext {
bank,
&Pubkey::default(),
pre_warp_slot,
// some warping tests cannot use the append vecs because of the sequence of adding roots and flushing
solana_accounts_db::accounts_db::CalcAccountsHashDataSource::IndexForTests,
))
.clone_without_scheduler()
};
Expand Down
7 changes: 1 addition & 6 deletions runtime/src/bank.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1689,12 +1689,7 @@ impl Bank {
/// in the past
/// * Adjusts the new bank's tick height to avoid having to run PoH for millions of slots
/// * Freezes the new bank, assuming that the user will `Bank::new_from_parent` from this bank
pub fn warp_from_parent(
parent: Arc<Bank>,
collector_id: &Pubkey,
slot: Slot,
_data_source: CalcAccountsHashDataSource, // will be removed next
) -> Self {
pub fn warp_from_parent(parent: Arc<Bank>, collector_id: &Pubkey, slot: Slot) -> Self {
parent.freeze();
let parent_timestamp = parent.clock().unix_timestamp;
let mut new = Bank::new_from_parent(parent, collector_id, slot);
Expand Down
Loading