1 files changed, 31 insertions, 26 deletions
diff --git a/src/model/version_table.rs b/src/model/version_table.rs
index 05cae831..e0b99770 100644
--- a/src/model/version_table.rs
+++ b/src/model/version_table.rs
@@ -10,6 +10,8 @@ use garage_table::*;
 
 use crate::block_ref_table::*;
 
+use garage_model_050::version_table as old;
+
 /// A version of an object
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct Version {
@@ -149,35 +151,38 @@ impl TableSchema for VersionTable {
 	}
 
 	fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
-		let old =
-			match rmp_serde::decode::from_read_ref::<_, garage_model_050::version_table::Version>(
-				bytes,
-			) {
-				Ok(x) => x,
-				Err(_) => return None,
-			};
-		let mut new_blocks = crdt::Map::new();
-		for (k, v) in old.blocks.items().iter() {
-			new_blocks.put(
-				VersionBlockKey {
-					part_number: k.part_number,
-					offset: k.offset,
-				},
-				VersionBlock {
-					hash: Hash::try_from(v.hash.as_slice()).unwrap(),
-					size: v.size,
-				},
-			);
-		}
-		let mut new_parts_etags = crdt::Map::new();
-		for (k, v) in old.parts_etags.items().iter() {
-			new_parts_etags.put(*k, v.clone());
-		}
+		let old = rmp_serde::decode::from_read_ref::<_, old::Version>(bytes).ok()?;
+
+		let blocks = old
+			.blocks
+			.items()
+			.iter()
+			.map(|(k, v)| {
+				(
+					VersionBlockKey {
+						part_number: k.part_number,
+						offset: k.offset,
+					},
+					VersionBlock {
+						hash: Hash::try_from(v.hash.as_slice()).unwrap(),
+						size: v.size,
+					},
+				)
+			})
+			.collect::<crdt::Map<_, _>>();
+
+		let parts_etags = old
+			.parts_etags
+			.items()
+			.iter()
+			.map(|(k, v)| (*k, v.clone()))
+			.collect::<crdt::Map<_, _>>();
+
 		Some(Version {
 			uuid: Hash::try_from(old.uuid.as_slice()).unwrap(),
 			deleted: crdt::Bool::new(old.deleted.get()),
-			blocks: new_blocks,
-			parts_etags: new_parts_etags,
+			blocks,
+			parts_etags,
 			bucket_id: blake2sum(old.bucket.as_bytes()),
 			key: old.key,
 		})