From 30b031da3224849b3133f1f808524a8180964f57 Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Tue, 24 May 2022 12:28:42 +1000 Subject: [PATCH] Fix schema version jump --- beacon_node/beacon_chain/src/schema_change.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/beacon_node/beacon_chain/src/schema_change.rs b/beacon_node/beacon_chain/src/schema_change.rs index 196aba2b3d..7a00f9b877 100644 --- a/beacon_node/beacon_chain/src/schema_change.rs +++ b/beacon_node/beacon_chain/src/schema_change.rs @@ -26,6 +26,12 @@ pub fn migrate_schema( match (from, to) { // Migrating from the current schema version to iself is always OK, a no-op. (_, _) if from == to && to == CURRENT_SCHEMA_VERSION => Ok(()), + // Upgrade for tree-states database changes. + (SchemaVersion(9), SchemaVersion(20)) => migration_schema_v20::upgrade_to_v20::(db, log), + // Downgrade for tree-states database changes. + (SchemaVersion(20), SchemaVersion(9)) => { + migration_schema_v20::downgrade_from_v20::(db, log) + } // Upgrade across multiple versions by recursively migrating one step at a time. (_, _) if from.as_u64() + 1 < to.as_u64() => { let next = SchemaVersion(from.as_u64() + 1); @@ -128,12 +134,6 @@ pub fn migrate_schema( migration_schema_v9::downgrade_from_v9::(db.clone(), log)?; db.store_schema_version(to) } - // Upgrade for tree-states database changes. - (SchemaVersion(9), SchemaVersion(20)) => migration_schema_v20::upgrade_to_v20::(db, log), - // Downgrade for tree-states database changes. - (SchemaVersion(20), SchemaVersion(9)) => { - migration_schema_v20::downgrade_from_v20::(db, log) - } // Anything else is an error. (_, _) => Err(HotColdDBError::UnsupportedSchemaVersion { target_version: to,