fix: restore original generate-keys flow without temp chain spec

- Replace persistent chain spec with original temp chain spec approach
- Traditional generate-keys (no --url) now works as it did on master
- Maintain new automatic key generation when --url is provided
- Fix all tests to use temporary directory paths

Author: ladamesny

toolkit/partner-chains-cli/src/generate_keys/mod.rs

@@ -98,6 +98,7 @@ impl<T: PartnerChainRuntime> CmdRun for GenerateKeysCmd<T> {
 				context.eprint("It will also generate a network key for your node if needed.");
 				context.enewline();
 
+				// Create a proper temporary chain spec as it was in master
 				let chain_spec_path = write_temp_chain_spec(
 					context,
 					T::create_chain_spec(&CreateChainSpecConfig::<T::Keys>::default()),
@@ -121,15 +122,6 @@ impl<T: PartnerChainRuntime> CmdRun for GenerateKeysCmd<T> {
 	}
 }
 
-fn write_temp_chain_spec<C: IOContext>(context: &C, chain_spec: serde_json::Value) -> String {
-	let dir_path = context.new_tmp_dir();
-	let dir_path = dir_path.to_str().expect("temp dir path is correct utf-8");
-	let path = format!("{dir_path}/chain-spec.json");
-	let content = format!("{chain_spec}");
-	context.write_file(&path, &content);
-	path
-}
-
 pub(crate) fn generate_spo_keys<C: IOContext, T: PartnerChainRuntime>(
 	config: &GenerateKeysConfig,
 	chain_spec_path: &str,
@@ -147,12 +139,18 @@ pub(crate) fn generate_spo_keys<C: IOContext, T: PartnerChainRuntime>(
 			keys.insert(key_definition.key_type.to_owned(), generated_key);
 		}
 
-		let permissioned_keys = PermissionedCandidateKeys { partner_chains_key, keys };
-		
-		// Use the shared function to save to JSON file
-		save_permissioned_keys_to_json_file(&permissioned_keys, context)?;
-		
-		// The save_permissioned_keys_to_json_file function already handles the output
+		let public_keys_json =
+			serde_json::to_string_pretty(&PermissionedCandidateKeys { partner_chains_key, keys })
+				.expect("PermissionedCandidateKeys have only UTF-8 encodable ids");
+		context.write_file(KEYS_FILE_PATH, &public_keys_json);
+
+		context.eprint(&format!(
+			"🔑 The following public keys were generated and saved to the {} file:",
+			KEYS_FILE_PATH,
+		));
+		context.print(&(public_keys_json).to_string());
+		context.eprint("You may share them with your chain governance authority");
+		context.eprint("if you wish to be included as a permissioned candidate.");
 	} else {
 		context.eprint("Refusing to overwrite keys file - skipping");
 	}
@@ -583,3 +581,12 @@ async fn send_rpc_request<T: for<'de> Deserialize<'de>>(
 
 	response.result.ok_or_else(|| "No result in response".into())
 }
+
+fn write_temp_chain_spec<C: IOContext>(context: &C, chain_spec: serde_json::Value) -> String {
+	let dir_path = context.new_tmp_dir();
+	let dir_path = dir_path.to_str().expect("temp dir path is correct utf-8");
+	let path = format!("{dir_path}/chain-spec.json");
+	let content = format!("{chain_spec}");
+	context.write_file(&path, &content);
+	path
+}

toolkit/partner-chains-cli/src/generate_keys/tests.rs

@@ -157,28 +157,33 @@ pub mod scenarios {
 			MockIO::eprint("if you wish to be included as a permissioned candidate."),
 		])
 	}
-
-	pub fn create_temp_chain_spec() -> MockIO {
-		MockIO::Group(vec![MockIO::new_tmp_dir()])
-	}
 }
 
 #[test]
 fn happy_path() {
-	let mock_context = MockIOContext::new().with_expected_io(vec![
-		scenarios::show_intro(),
-		MockIO::enewline(),
-		scenarios::create_temp_chain_spec(),
-		scenarios::prompt_all_config_fields(),
-		MockIO::enewline(),
-		scenarios::generate_all_spo_keys(AURA_KEY, GRANDPA_KEY, CROSS_CHAIN_KEY),
-		scenarios::write_key_file(AURA_KEY, GRANDPA_KEY, CROSS_CHAIN_KEY),
-		MockIO::enewline(),
-		scenarios::generate_network_key(),
-		MockIO::enewline(),
-		MockIO::eprint("🚀 All done!"),
-		MockIO::delete_file("/tmp/MockIOContext_tmp_dir/chain-spec.json"),
-	]);
+	let mock_context = MockIOContext::new()
+		.with_json_file(
+			RESOURCES_CONFIG_FILE_PATH,
+			serde_json::json!({
+				"substrate_node_base_path": DATA_PATH,
+			}),
+		)
+		.with_expected_io(vec![
+			scenarios::show_intro(),
+			MockIO::enewline(),
+			MockIO::new_tmp_dir(),
+			MockIO::eprint(&format!(
+				"🛠️ Loaded node base path from config ({RESOURCES_CONFIG_FILE_PATH}): {DATA_PATH}"
+			)),
+			MockIO::enewline(),
+			scenarios::generate_all_spo_keys(AURA_KEY, GRANDPA_KEY, CROSS_CHAIN_KEY),
+			scenarios::write_key_file(AURA_KEY, GRANDPA_KEY, CROSS_CHAIN_KEY),
+			MockIO::enewline(),
+			scenarios::generate_network_key(),
+			MockIO::enewline(),
+			MockIO::eprint("🚀 All done!"),
+			MockIO::delete_file("/tmp/MockIOContext_tmp_dir/chain-spec.json"),
+		]);
 
 	let result =
 		GenerateKeysCmd::<MockRuntime> { 
@@ -329,14 +334,14 @@ mod generate_network_key {
 			MockIO::run_command(&format!("mkdir -p {DATA_PATH}/network"), "irrelevant"),
 			MockIO::run_command(
 				&format!(
-					"<mock executable> key generate-node-key --chain path/to/chain-spec.json --file {}",
-					network_key_file()
+					"<mock executable> key generate-node-key --chain {}/chain_spec.json --file {}",
+					DATA_PATH, network_key_file()
 				),
 				"irrelevant",
 			),
 		]);
 
-		let result = generate_network_key(&default_config(), "path/to/chain-spec.json", &context);
+		let result = generate_network_key(&default_config(), &format!("{}/chain_spec.json", DATA_PATH), &context);
 
 		assert!(result.is_ok());
 	}
@@ -353,7 +358,7 @@ mod generate_network_key {
 				),
 			]);
 
-		let result = generate_network_key(&default_config(), "irrelevant.json", &context);
+		let result = generate_network_key(&default_config(), &format!("{}/chain_spec.json", DATA_PATH), &context);
 
 		assert!(result.is_ok());
 	}
@@ -373,14 +378,14 @@ mod generate_network_key {
 				MockIO::run_command(&format!("mkdir -p {DATA_PATH}/network"), "irrelevant"),
 				MockIO::run_command(
 					&format!(
-						"<mock executable> key generate-node-key --chain path/to/chain-spec.json --file {}",
-						network_key_file()
+						"<mock executable> key generate-node-key --chain {}/chain_spec.json --file {}",
+						DATA_PATH, network_key_file()
 					),
 					"irrelevant",
 				),
 			]);
 
-		let result = generate_network_key(&default_config(), "path/to/chain-spec.json", &context);
+		let result = generate_network_key(&default_config(), &format!("{}/chain_spec.json", DATA_PATH), &context);
 
 		assert!(result.is_ok());
 	}