Merge pull request #1943 from yahiheb/small-code-cleanup

Cleanup some code
zkSNACKs · Jul 28, 2019 · 9cb10d1 · 9cb10d1
2 parents e4cd0e6 + 4dc451a
commit 9cb10d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/WalletWasabi.Gui/CommandLine/Daemon.cs b/WalletWasabi.Gui/CommandLine/Daemon.cs
@@ -86,7 +86,6 @@ internal async Task RunAsync(string walletName, bool mixAll, bool keepMixAlive)
 					}
 
 					bool anyCoinsQueued = Global.ChaumianClient.State.AnyCoinsQueued();
-
 					if (!anyCoinsQueued && keepMixAlive) // If no coins queued and mixing is asked to be kept alive then try to queue coins.
 					{
 						await TryQueueCoinsToMixAsync(mixAll, password);
@@ -148,7 +147,6 @@ public KeyManager TryGetKeyManagerFromWalletName(string walletName)
 				if (keyManager is null)
 				{
 					Logger.LogCritical("Wallet was not supplied. Add --wallet:WalletName", nameof(Daemon));
-					return null;
 				}
 
 				return keyManager;

diff --git a/WalletWasabi/Gma/QrCodeNet/Encoding/EncodingRegion/Codeword.cs b/WalletWasabi/Gma/QrCodeNet/Encoding/EncodingRegion/Codeword.cs
@@ -29,11 +29,7 @@ internal static void TryEmbedCodewords(this TriStateMatrix tsMatrix, BitList cod
 					for (int xOffset = 0; xOffset < 2; xOffset++)
 					{
 						int xPos = x - xOffset;
-						if (tsMatrix.MStatus(xPos, y) != MatrixStatus.None)
-						{
-							continue;
-						}
-						else
+						if (tsMatrix.MStatus(xPos, y) == MatrixStatus.None)
 						{
 							bool bit;
 							if (bitIndex < codewordsSize)
@@ -49,8 +45,10 @@ internal static void TryEmbedCodewords(this TriStateMatrix tsMatrix, BitList cod
 							tsMatrix[xPos, y, MatrixStatus.Data] = bit;
 						}
 					}
+
 					y = NextY(y, directionUp);
 				}
+
 				directionUp = ChangeDirection(directionUp);
 				y = NextY(y, directionUp);
 				x -= 2;