f Drop all flags

Author: tnull

lightning-persister/src/fs_store.rs

@@ -525,17 +525,15 @@ mod tests {
 
 	#[test]
 	fn test_data_migration() {
-		for move_data in [true, false] {
-			let mut source_temp_path = std::env::temp_dir();
-			source_temp_path.push("test_data_migration_source");
-			let mut source_store = FilesystemStore::new(source_temp_path);
+		let mut source_temp_path = std::env::temp_dir();
+		source_temp_path.push("test_data_migration_source");
+		let mut source_store = FilesystemStore::new(source_temp_path);
 
-			let mut target_temp_path = std::env::temp_dir();
-			target_temp_path.push("test_data_migration_target");
-			let mut target_store = FilesystemStore::new(target_temp_path);
+		let mut target_temp_path = std::env::temp_dir();
+		target_temp_path.push("test_data_migration_target");
+		let mut target_store = FilesystemStore::new(target_temp_path);
 
-			do_test_data_migration(&mut source_store, &mut target_store, move_data);
-		}
+		do_test_data_migration(&mut source_store, &mut target_store);
 	}
 
 	#[test]

lightning-persister/src/test_utils.rs

@@ -63,7 +63,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStore + RefUnwindSafe>(kv_s
 }
 
 pub(crate) fn do_test_data_migration<S: MigratableKVStore, T: MigratableKVStore>(
-	source_store: &mut S, target_store: &mut T, move_data: bool,
+	source_store: &mut S, target_store: &mut T,
 ) {
 	// We fill the source with some bogus keys.
 	let primary_namespace_base = "testspace".to_string();
@@ -100,10 +100,7 @@ pub(crate) fn do_test_data_migration<S: MigratableKVStore, T: MigratableKVStore>
 	let all_keys = source_store.list_all_keys().unwrap();
 	assert_eq!(all_keys.len(), total_num_entries);
 
-	migrate_kv_store_data(source_store, target_store, true, move_data).unwrap();
-	if move_data {
-		assert_eq!(source_store.list_all_keys().unwrap().len(), 0);
-	}
+	migrate_kv_store_data(source_store, target_store).unwrap();
 
 	assert_eq!(target_store.list_all_keys().unwrap().len(), total_num_entries);
 	for (p, s, k) in &all_keys {