From 55312c2e9678e89fe3b825877df62c91b2c00a7f Mon Sep 17 00:00:00 2001 From: Xiang Zhu <xzhu70@gmail.com> Date: Mon, 21 Nov 2022 08:03:21 -0800 Subject: [PATCH] Rebase to the latest, resolve the conflicts --- ledger-tool/src/main.rs | 4 +--- validator/src/main.rs | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index f09ef901d002cf..c7f21cfe96b765 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -24,9 +24,7 @@ use { }, }, solana_cli_output::{CliAccount, CliAccountNewConfig, OutputFormat}, - solana_core::{ - system_monitor_service::SystemMonitorService, validator::move_and_async_delete_path, - }, + solana_core::system_monitor_service::SystemMonitorService, solana_entry::entry::Entry, solana_geyser_plugin_manager::geyser_plugin_service::GeyserPluginService, solana_ledger::{ diff --git a/validator/src/main.rs b/validator/src/main.rs index 3fed50bbd9c291..ed03aa4c52cac4 100644 --- a/validator/src/main.rs +++ b/validator/src/main.rs @@ -34,13 +34,7 @@ use { }, runtime_config::RuntimeConfig, snapshot_config::{SnapshotConfig, SnapshotUsage}, - snapshot_utils::{ - self, ArchiveFormat, SnapshotFrom, SnapshotVersion, DEFAULT_ARCHIVE_COMPRESSION, - DEFAULT_FULL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS, - DEFAULT_INCREMENTAL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS, - DEFAULT_MAX_FULL_SNAPSHOT_ARCHIVES_TO_RETAIN, - DEFAULT_MAX_INCREMENTAL_SNAPSHOT_ARCHIVES_TO_RETAIN, SUPPORTED_ARCHIVE_COMPRESSION, - }, + snapshot_utils::{self, ArchiveFormat, SnapshotFrom, SnapshotVersion}, }, solana_sdk::{ clock::{Slot, DEFAULT_S_PER_SLOT},