Use Tor executable from install dir #4505
Conversation
|
@yahiheb can you figure out something for CF? We cannot touch that file so I would say suppress the error somehow or disable for that folder/file. |
no, what's up with that? |
It describes how to delete those Or another (complicated) solution is to add a |
|
We cannot change the file, it is delivered by Tor, so that is not an option. |
|
@molnard |
It was used to check if the tor binaries need to be updated in the data folder. Now we are just running the one came with the installation so it is always the newest and don't need to manage Tor executable in the datadir. |
|
Tested on win, mac and linux. |
Co-authored-by: kiminuo <58662979+kiminuo@users.noreply.github.com>
|
I was not able to fix CF issues those should be handled here: #4531 |
| @@ -17,34 +18,18 @@ public class TorSettings | |||
| /// <param name="distributionFolderPath">Full path to folder containing Tor installation files.</param> | |||
| public TorSettings(string dataDir, string logFilePath, string distributionFolderPath) | |||
| { | |||
| TorDir = Path.Combine(dataDir, "tor"); | |||
| TorBinaryDir = Path.Combine(TorDir, "Tor"); | |||
| var torBinary = MicroserviceHelpers.GetBinaryPath(Path.Combine("Tor", "tor")); | |||
There was a problem hiding this comment.
This should be a parameter of TorSettings too. TorSettings was meant to be purely data wrapper class that does not "find paths to something".
Ready to review!
Instead of copy/update/execute Tor binaries from datadir, Wasabi will just run Tor from the installation dir like it does with HWI and bitcoind.
The first step of this #4501