f Simplify test data generation logic

Author: tnull

lightning-persister/src/test_utils.rs

@@ -66,30 +66,19 @@ pub(crate) fn do_test_data_migration<S: MigratableKVStore, T: MigratableKVStore>
 	source_store: &mut S, target_store: &mut T,
 ) {
 	// We fill the source with some bogus keys.
-	let primary_namespace_base = "testspace".to_string();
-	let secondary_namespace_base = "testsubspace".to_string();
-	let key_base = "testkey".to_string();
-	let alphabet_len = KVSTORE_NAMESPACE_KEY_ALPHABET.len();
-
 	let dummy_data = [42u8; 32];
-
-	let num_primary_namespaces = 5;
-	let num_secondary_namespaces = 5;
-	let num_keys = 10;
+	let num_primary_namespaces = 2;
+	let num_secondary_namespaces = 2;
+	let num_keys = 3;
 	for i in 0..num_primary_namespaces {
-		let primary_ext = KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(i % alphabet_len).unwrap();
-		let mut primary_namespace = primary_namespace_base.clone();
-		primary_namespace.push(primary_ext);
+		let primary_namespace =
+			format!("testspace{}", KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(i).unwrap());
 		for j in 0..num_secondary_namespaces {
-			let secondary_ext =
-				KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(j % alphabet_len).unwrap();
-			let mut secondary_namespace = secondary_namespace_base.clone();
-			secondary_namespace.push(secondary_ext);
+			let secondary_namespace =
+				format!("testsubspace{}", KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(j).unwrap());
 			for k in 0..num_keys {
-				let key_ext = KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(k % alphabet_len).unwrap();
-				let mut key = key_base.clone();
-				key.push(key_ext);
-
+				let key =
+					format!("testkey{}", KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(k).unwrap());
 				source_store
 					.write(&primary_namespace, &secondary_namespace, &key, &dummy_data)
 					.unwrap();