refactors fix tree keys, cache genesis roots, and value balance upgra…

…des to use new trait

zebra-state/src/service/finalized_state/disk_format/upgrade.rs

@@ -25,7 +25,9 @@ use crate::service::finalized_state::ZebraDb;
 pub(crate) mod add_subtrees;
 pub(crate) mod cache_genesis_roots;
 pub(crate) mod fix_tree_key_type;
+pub(crate) mod no_migration;
 pub(crate) mod prune_trees;
+pub(crate) mod tree_keys_and_caches_upgrade;
 
 #[cfg(not(feature = "indexer"))]
 pub(crate) mod drop_tx_locs_by_spends;
@@ -72,15 +74,21 @@ pub trait DiskFormatUpgrade {
     ) -> Result<(), CancelFormatChange> {
         Ok(())
     }
+
+    /// Returns true if the [`DiskFormatUpgrade`] needs to run a migration on existing data in the db.
+    fn needs_migration(&self) -> bool {
+        true
+    }
 }
 
 fn format_upgrades() -> Vec<Box<dyn DiskFormatUpgrade>> {
+    // Note: Disk format upgrades must be run in order.
     vec![
         Box::new(prune_trees::PruneTrees),
         Box::new(add_subtrees::AddSubtrees),
-        // TODO:
-        // Box::new(cache_genesis_roots::CacheGenesisRoots),
-        // Box::new(fix_tree_key_type::FixTreeKeyType),
+        Box::new(tree_keys_and_caches_upgrade::FixTreeKeyTypeAndCacheGenesisRoots),
+        // Value balance upgrade
+        Box::new(no_migration::NoMigration::new(26, 0, 0)),
     ]
 }
 
@@ -532,6 +540,11 @@ impl DbFormatChange {
                 continue;
             }
 
+            if !upgrade.needs_migration() {
+                Self::mark_as_upgraded_to(db, &upgrade.version());
+                continue;
+            }
+
             let timer = CodeTimer::start();
 
             upgrade.prepare(initial_tip_height, db, cancel_receiver, older_disk_version)?;
@@ -553,32 +566,6 @@ impl DbFormatChange {
             timer.finish(module_path!(), line!(), upgrade.description());
         }
 
-        // Sprout & history tree key formats, and cached genesis tree roots database upgrades.
-
-        let version_for_tree_keys_and_caches =
-            Version::parse("25.3.0").expect("Hardcoded version string should be valid.");
-
-        // Check if we need to do the upgrade.
-        if older_disk_version < &version_for_tree_keys_and_caches {
-            let timer = CodeTimer::start();
-
-            // It shouldn't matter what order these are run in.
-            cache_genesis_roots::run(initial_tip_height, db, cancel_receiver)?;
-            fix_tree_key_type::run(initial_tip_height, db, cancel_receiver)?;
-
-            // Before marking the state as upgraded, check that the upgrade completed successfully.
-            cache_genesis_roots::detailed_check(db, cancel_receiver)?
-                .expect("database format is valid after upgrade");
-            fix_tree_key_type::detailed_check(db, cancel_receiver)?
-                .expect("database format is valid after upgrade");
-
-            // Mark the database as upgraded. Zebra won't repeat the upgrade anymore once the
-            // database is marked, so the upgrade MUST be complete at this point.
-            Self::mark_as_upgraded_to(db, &version_for_tree_keys_and_caches);
-
-            timer.finish(module_path!(), line!(), "tree keys and caches upgrade");
-        }
-
         let version_for_upgrading_value_balance_format =
             Version::parse("26.0.0").expect("hard-coded version string should be valid");
 
@@ -587,14 +574,6 @@ impl DbFormatChange {
             Self::mark_as_upgraded_to(db, &version_for_upgrading_value_balance_format)
         }
 
-        // # New Upgrades Usually Go Here
-        //
-        // New code goes above this comment!
-        //
-        // Run the latest format upgrade code after the other upgrades are complete,
-        // then mark the format as upgraded. The code should check `cancel_receiver`
-        // every time it runs its inner update loop.
-
         info!(
             %newer_running_version,
             "Zebra automatically upgraded the database format to:"
@@ -650,9 +629,6 @@ impl DbFormatChange {
             results.push(upgrade.validate(db, cancel_receiver)?);
         }
 
-        results.push(cache_genesis_roots::detailed_check(db, cancel_receiver)?);
-        results.push(fix_tree_key_type::detailed_check(db, cancel_receiver)?);
-
         // The work is done in the functions we just called.
         timer.finish(module_path!(), line!(), "format_validity_checks_detailed()");
 

zebra-state/src/service/finalized_state/disk_format/upgrade/no_migration.rs

@@ -0,0 +1,48 @@
+//! An implementation of [`DiskFormatUpgrade`] for marking the database as upgraded to a new format version.
+
+use crossbeam_channel::Receiver;
+
+use semver::Version;
+use zebra_chain::block::Height;
+
+use crate::service::finalized_state::ZebraDb;
+
+use super::{CancelFormatChange, DiskFormatUpgrade};
+
+/// Implements [`DiskFormatUpgrade`] for pruning duplicate Sapling and Orchard note commitment trees from database
+pub struct NoMigration {
+    version: Version,
+}
+
+impl NoMigration {
+    /// Creates a new instance of the [`NoMigration`] upgrade.
+    pub fn new(major: u64, minor: u64, patch: u64) -> Self {
+        Self {
+            version: Version::new(major, minor, patch),
+        }
+    }
+}
+
+impl DiskFormatUpgrade for NoMigration {
+    fn version(&self) -> Version {
+        self.version.clone()
+    }
+
+    fn description(&self) -> &'static str {
+        "no migration"
+    }
+
+    #[allow(clippy::unwrap_in_result)]
+    fn run(
+        &self,
+        _initial_tip_height: Height,
+        _db: &ZebraDb,
+        _cancel_receiver: &Receiver<CancelFormatChange>,
+    ) -> Result<(), CancelFormatChange> {
+        Ok(())
+    }
+
+    fn needs_migration(&self) -> bool {
+        false
+    }
+}

zebra-state/src/service/finalized_state/disk_format/upgrade/tree_keys_and_caches_upgrade.rs

@@ -0,0 +1,57 @@
+//! Applies the [`fix_tree_key_type`] and [`cache_genesis_roots`] upgrades to the database.
+
+use crossbeam_channel::Receiver;
+
+use semver::Version;
+use zebra_chain::block::Height;
+
+use crate::service::finalized_state::ZebraDb;
+
+use super::{cache_genesis_roots, fix_tree_key_type, CancelFormatChange, DiskFormatUpgrade};
+
+/// Implements [`DiskFormatUpgrade`] for updating the sprout and history tree key type from
+/// `Height` to the empty key `()` and the genesis note commitment trees to cache their roots
+pub struct FixTreeKeyTypeAndCacheGenesisRoots;
+
+impl DiskFormatUpgrade for FixTreeKeyTypeAndCacheGenesisRoots {
+    fn version(&self) -> Version {
+        Version::new(25, 3, 0)
+    }
+
+    fn description(&self) -> &'static str {
+        "tree keys and caches upgrade"
+    }
+
+    #[allow(clippy::unwrap_in_result)]
+    fn run(
+        &self,
+        initial_tip_height: Height,
+        db: &ZebraDb,
+        cancel_receiver: &Receiver<CancelFormatChange>,
+    ) -> Result<(), CancelFormatChange> {
+        // It shouldn't matter what order these are run in.
+        cache_genesis_roots::run(initial_tip_height, db, cancel_receiver)?;
+        fix_tree_key_type::run(initial_tip_height, db, cancel_receiver)?;
+        Ok(())
+    }
+
+    #[allow(clippy::unwrap_in_result)]
+    fn validate(
+        &self,
+        db: &ZebraDb,
+        cancel_receiver: &Receiver<CancelFormatChange>,
+    ) -> Result<Result<(), String>, CancelFormatChange> {
+        let results = [
+            cache_genesis_roots::detailed_check(db, cancel_receiver)?,
+            fix_tree_key_type::detailed_check(db, cancel_receiver)?,
+        ];
+
+        let result = if results.iter().any(Result::is_err) {
+            Err(format!("{results:?}"))
+        } else {
+            Ok(())
+        };
+
+        Ok(result)
+    }
+}