Merge pull request #5380 from molnard/backport_v12_5_digfix

Do not delete digest file when packaging
WalletWasabi · Mar 16, 2021 · 890391b · 890391b
2 parents 816c19b + 38fb311
commit 890391b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/WalletWasabi.Packager/Program.cs b/WalletWasabi.Packager/Program.cs
@@ -422,7 +422,7 @@ private static void Publish()
 
 				foreach (var file in torFolder.EnumerateFiles())
 				{
-					if (!file.Name.Contains("data", StringComparison.OrdinalIgnoreCase) && !file.Name.Contains(toNotRemove, StringComparison.OrdinalIgnoreCase))
+					if (!file.Name.Contains("data", StringComparison.OrdinalIgnoreCase) && !file.Name.Contains("digest", StringComparison.OrdinalIgnoreCase) && !file.Name.Contains(toNotRemove, StringComparison.OrdinalIgnoreCase))
 					{
 						File.Delete(file.FullName);
 					}

diff --git a/WalletWasabi.Tests/UnitTests/Hwi/HwiProcessBridgeMock.cs b/WalletWasabi.Tests/UnitTests/Hwi/HwiProcessBridgeMock.cs
@@ -126,7 +126,7 @@ public Task<(string response, int exitCode)> SendCommandAsync(string arguments,
 				}
 				else if (Model == HardwareWalletModels.Ledger_Nano_X)
 				{
-					response = "{\"error\": \"The Ledger Nano X does not support wiping via software\", \"code\": -9}\r\n";
+					response = "{\"error\": \"The Ledger Nano X does not support software setup\", \"code\": -9}\r\n";
 				}
 			}
 			else if (CompareArguments(arguments, $"{devicePathAndTypeArgumentString} --interactive setup"))
@@ -145,7 +145,7 @@ public Task<(string response, int exitCode)> SendCommandAsync(string arguments,
 				}
 				else if (Model == HardwareWalletModels.Ledger_Nano_X)
 				{
-					response = "{\"error\": \"The Ledger Nano X does not support wiping via software\", \"code\": -9}\r\n";
+					response = "{\"error\": \"The Ledger Nano X does not support software setup\", \"code\": -9}\r\n";
 				}
 			}
 			else if (CompareArguments(arguments, $"{devicePathAndTypeArgumentString} --interactive restore"))
@@ -164,7 +164,7 @@ public Task<(string response, int exitCode)> SendCommandAsync(string arguments,
 				}
 				else if (Model == HardwareWalletModels.Ledger_Nano_X)
 				{
-					response = "{\"error\": \"The Ledger Nano X does not support wiping via software\", \"code\": -9}\r\n";
+					response = "{\"error\": \"The Ledger Nano X does not support restoring via software\", \"code\": -9}\r\n";
 				}
 			}
 			else if (CompareArguments(arguments, $"{devicePathAndTypeArgumentString} promptpin"))
@@ -183,7 +183,7 @@ public Task<(string response, int exitCode)> SendCommandAsync(string arguments,
 				}
 				else if (Model == HardwareWalletModels.Ledger_Nano_X)
 				{
-					response = "{\"error\": \"The Ledger Nano X does not support wiping via software\", \"code\": -9}\r\n";
+					response = "{\"error\": \"The Ledger Nano X does not need a PIN sent from the host\", \"code\": -9}\r\n";
 				}
 			}
 			else if (CompareArguments(arguments, $"{devicePathAndTypeArgumentString} sendpin", true))
@@ -202,7 +202,7 @@ public Task<(string response, int exitCode)> SendCommandAsync(string arguments,
 				}
 				else if (Model == HardwareWalletModels.Ledger_Nano_X)
 				{
-					response = "{\"error\": \"The Ledger Nano X does not support wiping via software\", \"code\": -9}\r\n";
+					response = "{\"error\": \"The Ledger Nano X does not need a PIN sent from the host\", \"code\": -9}\r\n";
 				}
 			}
 			else if (CompareGetXbpubArguments(arguments, out string xpub))