From 46c2780e1b3557131b1c891da772a3936ce5c0ef Mon Sep 17 00:00:00 2001 From: steviez Date: Thu, 22 Jun 2023 10:11:16 -0500 Subject: [PATCH] Remove duplicate code from local-cluster save_tower() (#32240) The same logic is used in Tower::save(), so use Tower::save() directly. --- local-cluster/tests/common/mod.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/local-cluster/tests/common/mod.rs b/local-cluster/tests/common/mod.rs index 61ee7b0be..cd7a9b920 100644 --- a/local-cluster/tests/common/mod.rs +++ b/local-cluster/tests/common/mod.rs @@ -4,7 +4,7 @@ use { solana_core::{ broadcast_stage::BroadcastStageType, consensus::{Tower, SWITCH_FORK_THRESHOLD}, - tower_storage::{FileTowerStorage, SavedTower, SavedTowerVersions, TowerStorage}, + tower_storage::FileTowerStorage, validator::ValidatorConfig, }, solana_gossip::gossip_service::discover_cluster, @@ -544,8 +544,5 @@ pub fn setup_snapshot_validator_config( pub fn save_tower(tower_path: &Path, tower: &Tower, node_keypair: &Keypair) { let file_tower_storage = FileTowerStorage::new(tower_path.to_path_buf()); - let saved_tower = SavedTower::new(tower, node_keypair).unwrap(); - file_tower_storage - .store(&SavedTowerVersions::from(saved_tower)) - .unwrap(); + tower.save(&file_tower_storage, node_keypair).unwrap(); }