Some of the tests work!

Author: sangbida

tests/test_wallet.py

@@ -1532,16 +1532,17 @@ def test_hsmtool_checkhsm_with_passphrase(node_factory):
     hsmtool = HsmTool(node_factory.directory, "checkhsm", hsm_path)
     master_fd, slave_fd = os.openpty()
     hsmtool.start(stdin=slave_fd)
-    hsmtool.wait_for_log(r"Enter hsm_secret password:")  # Unlock file
+    hsmtool.wait_for_log(r"Enter hsm_secret password:")  # Decrypt file
     write_all(master_fd, "secret_passphrase\n".encode("utf-8"))
-    hsmtool.wait_for_log(r"Enter your passphrase:")  # Verification passphrase
+    hsmtool.wait_for_log(r"Enter your passphrase:")     # Backup verification
     write_all(master_fd, "secret_passphrase\n".encode("utf-8"))
     hsmtool.wait_for_log(r"Introduce your BIP39 word list")
     write_all(master_fd, "ritual idle hat sunny universe pluck key alpha wing cake have wedding\n".encode("utf-8"))
     assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0
     hsmtool.is_in_log(r"OK")
 
 
+
 def test_hsmtool_checkhsm_no_passphrase(node_factory):
     """Test checkhsm with mnemonic that has no passphrase"""
     l1 = node_factory.get_node(start=False)
@@ -2059,8 +2060,6 @@ def test_hsmtool_makerune(node_factory):
     hsmtool = HsmTool(node_factory.directory, "generatehsm", hsm_path)
     master_fd, slave_fd = os.openpty()
     hsmtool.start(stdin=slave_fd)
-    hsmtool.wait_for_log(r"Select your language:")
-    write_all(master_fd, "0\n".encode("utf-8"))
     hsmtool.wait_for_log(r"Introduce your BIP39 word list")
     write_all(master_fd, "ritual idle hat sunny universe pluck key alpha wing "
               "cake have wedding\n".encode("utf-8"))
@@ -2069,8 +2068,14 @@ def test_hsmtool_makerune(node_factory):
     assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0
     hsmtool.is_in_log(r"New hsm_secret file created")
 
-    cmd_line = ["tools/hsmtool", "makerune", hsm_path]
-    out = subprocess.check_output(cmd_line).decode("utf8").split("\n")[0]
+    # Test makerune with the passphrase
+    hsmtool = HsmTool(node_factory.directory, "makerune", hsm_path)
+    master_fd, slave_fd = os.openpty()
+    hsmtool.start(stdin=slave_fd)
+    hsmtool.wait_for_log(r"Enter hsm_secret password:")
+    write_all(master_fd, "This is actually not a passphrase\n".encode("utf-8"))
+    assert hsmtool.proc.wait(WAIT_TIMEOUT) == 0
+    out = hsmtool.logs.split("\n")[-2]  # Get the rune output (last line before empty line)
 
     l1.start()
 

tools/hsmtool.c

@@ -532,8 +532,6 @@ static int check_hsm(const char *hsm_secret_path)
 		errx(EXITCODE_ERROR_HSM_FILE, "Reading hsm_secret");
 	tal_resize(&contents, tal_bytelen(contents) - 1);
 
-	enum hsm_secret_type type = detect_hsm_secret_type(contents, tal_bytelen(contents));
-
 	/* Get the actual seed from the file */
 	struct hsm_secret *hsms = load_hsm_secret(tmpctx, hsm_secret_path);
 	file_secret = hsms->secret;