Remove mixall (no usage for it anymore.)
MODIFY
WalletWasabi.Gui/CommandLine/Daemon.cs
WalletWasabi.Gui/CommandLine/Daemon.cs
@@ -22,7 +22,7 @@ namespace WalletWasabi.Gui.CommandLine
private WalletService WalletService { get; set; }
- internal async Task RunAsync(string walletName, string destinationWalletName, bool mixAll, bool keepMixAlive)
+ internal async Task RunAsync(string walletName, string destinationWalletName, bool keepMixAlive)
{
try
{
@@ -93,14 +93,6 @@ namespace WalletWasabi.Gui.CommandLine
await Global.WalletManager.CreateAndStartWalletServiceAsync(destinationKeyManager);
}
- // Enqueue coins up to the anonset target, except if mixall, because then enqueue all coins.
- // However if destination is specified, then disregard this initial enqueue.
- // This way mixall will have no effect. Or more specifically the output wallet specification will mix on top of mixed coins, so the result is the same.
- if (!isDestinationSpecified)
- {
- await TryQueueCoinsToMixAsync(password, maxAnonset: mixAll ? int.MaxValue : WalletService.ServiceConfiguration.MixUntilAnonymitySet - 1);
- }
-
do
{
if (Global.KillRequested)
@@ -125,7 +117,6 @@ namespace WalletWasabi.Gui.CommandLine
// If no coins were queued then try to queue coins those have less anonset and mix it into the same wallet.
if (!AnyCoinsQueued())
{
- // Don't do mixall here, the mixall says all the coins has to be mixed once, it doesn't says it has to be requeued all the time.
WalletService.ChaumianClient.DestinationKeyManager = WalletService.ChaumianClient.KeyManager;
await TryQueueCoinsToMixAsync(password, maxAnonset: WalletService.ServiceConfiguration.MixUntilAnonymitySet - 1);
}

MODIFY
WalletWasabi.Gui/CommandLine/MixerCommand.cs
WalletWasabi.Gui/CommandLine/MixerCommand.cs
@@ -10,7 +10,6 @@ namespace WalletWasabi.Gui.CommandLine
{
public string WalletName { get; set; }
public string DestinationWalletName { get; set; }
- public bool MixAll { get; set; }
public bool KeepMixAlive { get; set; }
public bool ShowHelp { get; set; }
public Daemon Daemon { get; }
@@ -21,14 +20,13 @@ namespace WalletWasabi.Gui.CommandLine
Daemon = daemon;
Options = new OptionSet()
{
- "usage: mix --wallet:WalletName --mixall --keepalive",
+ "usage: mix --wallet:WalletName --keepalive",
"",
"Start mixing without the GUI with the specified wallet.",
- "eg: ./wassabee mix --wallet:MyWalletName --mixall --keepalive",
+ "eg: ./wassabee mix --wallet:MyWalletName --keepalive",
{ "h|help", "Displays help page and exit.", x => ShowHelp = x != null },
{ "w|wallet:", "The name of the wallet file.", x => WalletName = x },
{ "destination:", "The name of the destination wallet file.", x => DestinationWalletName = x },
- { "mixall", "Mix once even if the coin reached the target anonymity set specified in the config file.", x => MixAll = x != null },
{ "keepalive", "Do not exit the software after mixing has been finished, rather keep mixing when new money arrives.", x => KeepMixAlive = x != null }
};
}
@@ -46,7 +44,7 @@ namespace WalletWasabi.Gui.CommandLine
if (!error && !ShowHelp)
{
- await Daemon.RunAsync(WalletName, DestinationWalletName ?? WalletName, MixAll, KeepMixAlive);
+ await Daemon.RunAsync(WalletName, DestinationWalletName ?? WalletName, KeepMixAlive);
}
}
catch (Exception ex)

Remove mixall (no usage for it anymore.)