Skip to content

Commit

Permalink
Remove marker-file based abortion mechanism
Browse files Browse the repository at this point in the history
  • Loading branch information
ryoqun committed Sep 11, 2024
1 parent 284a1b6 commit f4a1ca8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
16 changes: 1 addition & 15 deletions ledger-tool/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ use {
solana_cost_model::{cost_model::CostModel, cost_tracker::CostTracker},
solana_feature_set::{self as feature_set, FeatureSet},
solana_ledger::{
blockstore::{
banking_trace_path, create_new_ledger, simulate_block_production_marker_path,
Blockstore,
},
blockstore::{banking_trace_path, create_new_ledger, Blockstore},
blockstore_options::{AccessType, LedgerColumnOptions},
blockstore_processor::{
ProcessSlotCallback, TransactionStatusMessage, TransactionStatusSender,
Expand Down Expand Up @@ -2479,17 +2476,6 @@ fn main() {
}
}
("simulate-block-production", Some(arg_matches)) => {
let marker_file = simulate_block_production_marker_path(&ledger_path);
if !marker_file.exists() {
eprintln!(
"simulate-block-production is for development purposes only. \
It's thus a pretty destructive operation on \
the ledger ({ledger_path:?}). \
Create an empty file at {marker_file:?} if this is intentional."
);
exit(1);
}

let mut process_options = parse_process_options(&ledger_path, arg_matches);

let banking_trace_events = load_banking_trace_events_or_exit(&ledger_path);
Expand Down
4 changes: 0 additions & 4 deletions ledger/src/blockstore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,6 @@ pub fn banking_retrace_path(path: &Path) -> PathBuf {
path.join("banking_retrace")
}

pub fn simulate_block_production_marker_path(path: &Path) -> PathBuf {
path.join("simulate_block_production_allowed")
}

impl Blockstore {
pub fn db(self) -> Arc<Database> {
self.db
Expand Down

0 comments on commit f4a1ca8

Please sign in to comment.