Fix lint

Author: everoddandeven

Monero.Test/TestMoneroDaemonRpc.cs

@@ -11,7 +11,7 @@ namespace Monero.Test;
 public class MoneroDaemonRpcFixture : IDisposable
 {
     public readonly TestContext BINARY_BLOCK_CTX = new();
-    
+
     public MoneroDaemonRpc Daemon;
     public MoneroWalletRpc Wallet;
     public bool IsRestricted;
@@ -21,7 +21,7 @@ public MoneroDaemonRpcFixture()
         Daemon = TestUtils.GetDaemonRpc();
         //Wallet = TestUtils.GetWalletRpc();
         IsRestricted = Daemon.IsRestricted();
-        
+
         BINARY_BLOCK_CTX.hasHex = false;
         BINARY_BLOCK_CTX.headerIsFull = false;
         BINARY_BLOCK_CTX.hasTxs = true;
@@ -33,11 +33,11 @@ public MoneroDaemonRpcFixture()
         BINARY_BLOCK_CTX.txContext.fromBinaryBlock = true;
 
         TestUtils.WALLET_TX_TRACKER.Reset(); // all wallets need to wait for txs to confirm to reliably sync
-        
+
         // Wait for some blocks to mine
         GenUtils.WaitFor(10000);
     }
-    
+
     public void Dispose()
     {
         GC.SuppressFinalize(this);
@@ -58,11 +58,11 @@ public class TestMoneroDaemonRpc : IClassFixture<MoneroDaemonRpcFixture>
     private static TestContext BINARY_BLOCK_CTX = new();
 
     private MoneroDaemonRpcFixture fixture;
-    
+
     public TestMoneroDaemonRpc(MoneroDaemonRpcFixture fixture)
     {
         BINARY_BLOCK_CTX = fixture.BINARY_BLOCK_CTX;
-        
+
         daemon = fixture.Daemon;
         wallet = fixture.Wallet;
 
@@ -80,7 +80,7 @@ public TestMoneroDaemonRpc(MoneroDaemonRpcFixture fixture)
     }
 
     #region Non Relays Tests
-    
+
     [Fact]
     public void TestGetVersion()
     {
@@ -1124,7 +1124,7 @@ public void TestMining()
         daemon.StartMining(address, 1, false, true);
 
         GenUtils.WaitFor(30);
-        
+
         // stop mining
         daemon.StopMining();
     }
@@ -1168,7 +1168,7 @@ public void TestGetMiningStatus()
         }
         catch (MoneroError e)
         {
-            throw e;
+            throw;
         }
         finally
         {
@@ -1403,7 +1403,7 @@ public void TestBlockListener()
         }
         catch (MoneroError e)
         {
-            throw e;
+            throw;
         }
         finally
         {
@@ -1432,7 +1432,7 @@ private static void MineBlocks()
             MoneroUtils.Log(0, e.Message);
         }
     }
-    
+
     private static void TestBlockHeader(MoneroBlockHeader? header, bool isFull)
     {
         Assert.NotNull(header);
@@ -1627,9 +1627,9 @@ private static void TestTx(MoneroTx? tx, TestContext? ctx)
         if (tx.IsConfirmed() == true)
         {
             Assert.NotNull(tx.GetBlock());
-            Assert.True(tx.GetBlock().GetTxs().Contains(tx));
+            Assert.Contains(tx, tx.GetBlock().GetTxs());
             Assert.True(tx.GetBlock().GetHeight() > 0);
-            Assert.True(tx.GetBlock().GetTxs().Contains(tx));
+            Assert.Contains(tx, tx.GetBlock().GetTxs());
             Assert.True(tx.GetBlock().GetHeight() > 0);
             Assert.True(tx.GetBlock().GetTimestamp() > 0);
             Assert.True(tx.GetRelay());
@@ -1742,7 +1742,7 @@ private static void TestTx(MoneroTx? tx, TestContext? ctx)
             if (ctx.fromBinaryBlock == true) Assert.Null(tx.GetFullHex());         // TODO: GetBlocksByHeight() has inconsistent client-side pruning
             else Assert.True(tx.GetFullHex().Length > 0);
             if (ctx.fromBinaryBlock == true) Assert.Null(tx.GetRctSigPrunable());  // TODO: GetBlocksByHeight() has inconsistent client-side pruning
-                                                                                           //else Assert.NotNull((tx.GetRctSigPrunable()); // TODO: define and test this
+                                                                                   //else Assert.NotNull((tx.GetRctSigPrunable()); // TODO: define and test this
             Assert.False(tx.IsDoubleSpendSeen());
             if (tx.IsConfirmed() == true)
             {
@@ -2058,8 +2058,6 @@ private static void TestPeer(MoneroPeer peer)
         Assert.True(peer.GetCurrentUpload() >= 0);
         Assert.True(peer.GetHeight() >= 0);
         Assert.True(peer.GetLiveTime() >= 0);
-        Assert.NotNull(peer.IsLocalIp());
-        Assert.NotNull(peer.IsLocalHost());
         Assert.True(peer.GetNumReceives() >= 0);
         Assert.True(peer.GetReceiveIdleTime() >= 0);
         Assert.True(peer.GetNumSends() >= 0);
@@ -2076,7 +2074,6 @@ private static void TestKnownPeer(MoneroPeer peer, bool fromConnection)
         Assert.True(peer.GetHost().Length > 0);
         Assert.True(peer.GetPort() > 0);
         Assert.True(peer.GetRpcPort() == null || peer.GetRpcPort() >= 0);
-        Assert.NotNull(peer.IsOnline());
         //if (peer.GetRpcCreditsPerHash() != null) TestUtils.testUnsignedBigInteger(peer.GetRpcCreditsPerHash());
         if (fromConnection) Assert.Null(peer.GetLastSeenTimestamp());
         else
@@ -2145,7 +2142,7 @@ private static void TestSubmitTxResultGood(MoneroSubmitTxResult result)
         catch (Exception e)
         {
             MoneroUtils.Log(0, "Submit result is not good");
-            throw e;
+            throw;
         }
     }
 
@@ -2224,7 +2221,7 @@ private static void TestSubmitThenRelay(List<MoneroTx> txs)
         catch (Exception e)
         {
             daemon.FlushTxPool(txHashes); // flush txs when relay fails to prevent double spends in other tests
-            throw e;
+            throw;
         }
 
         // wait for txs to be relayed // TODO (monero-project): all txs should be relayed: https://github.com/monero-project/monero/issues/8523

Monero.Test/Utils/TestUtils.cs

@@ -99,7 +99,7 @@ public static MoneroWalletRpc GetWalletRpc()
             }
             else
             {
-                throw e;
+                throw;
             }
         }
 
@@ -162,7 +162,7 @@ public static string GetExternalWalletAddress()
         }
 
         MoneroNetworkType? networkType = info.GetNetworkType();
-        
+
         switch (networkType)
         {
             case MoneroNetworkType.STAGENET:
@@ -176,7 +176,7 @@ public static string GetExternalWalletAddress()
         }
     }
 
-    public static MoneroWallet CreateWalletGroundTruth(MoneroNetworkType networkType, string seed, ulong? startHeight, ulong? restoreHeight) 
+    public static MoneroWallet CreateWalletGroundTruth(MoneroNetworkType networkType, string seed, ulong? startHeight, ulong? restoreHeight)
     {
         throw new NotImplementedException("MoneroWalletFull is not implemented");
     }
@@ -192,7 +192,8 @@ public static bool TxsMergeable(MoneroTxWallet tx1, MoneroTxWallet tx2)
             copy1.Merge(copy2);
             return true;
         }
-        catch (Exception e) {
+        catch (Exception e)
+        {
             Console.WriteLine(e);
             return false;
         }

Monero/Common/GenUtils.cs

@@ -9,7 +9,7 @@ public static string GetGuid()
     {
         return Guid.NewGuid().ToString();
     }
-    
+
     public static T? Reconcile<T>(T? val1, T? val2, bool? resolveDefined = null, bool? resolveTrue = null, bool? resolveMax = null)
     {
         // check for the same reference
@@ -26,9 +26,9 @@ public static string GetGuid()
 
         if (val1 is bool bool1 && val2 is bool bool2)
         {
-            if (bool1 ==  bool2) return val1;
+            if (bool1 == bool2) return val1;
         }
-        
+
         // resolve one value null
         if (val1 == null || val2 == null)
         {
@@ -41,7 +41,7 @@ public static string GetGuid()
         {
             return (T)(object)resolveTrue.Value;
         }
-        
+
         if (val1 is IEnumerable e1 && val2 is IEnumerable e2)
         {
             var list1 = e1.Cast<object>().ToList();
@@ -119,8 +119,9 @@ public static string GetGuid()
         Array.Copy(array, startIndexInclusive, subarray, 0, newSize);
         return subarray;
     }
-    
-    public static void WaitFor(ulong durationMs) {
+
+    public static void WaitFor(ulong durationMs)
+    {
         WaitFor((int)durationMs);
     }
 
@@ -136,13 +137,15 @@ public static void WaitFor(int durationMs)
             throw new Exception("Thread was interrupted while sleeping");
         }
     }
-        
-    public static string KvLine(object? key, object? value, int indent, bool newline = true, bool ignoreUndefined = true) {
+
+    public static string KvLine(object? key, object? value, int indent, bool newline = true, bool ignoreUndefined = true)
+    {
         if (value == null && ignoreUndefined) return "";
         return GetIndent(indent) + key + ": " + value + (newline ? '\n' : "");
     }
-        
-    public static string GetIndent(int length) {
+
+    public static string GetIndent(int length)
+    {
         string str = "";
         for (int i = 0; i < length; i++) str += "  "; // two spaces
         return str;

Monero/Common/MoneroBlockHeader.cs

@@ -266,28 +266,28 @@ public virtual MoneroBlockHeader Merge(MoneroBlockHeader? header)
         this.SetPowHash(GenUtils.Reconcile(this.GetPowHash(), header.GetPowHash()));
         return this;
     }
-    
+
     public virtual bool Equals(MoneroBlockHeader? other)
     {
         if (other == null) return false;
         if (other == this) return true;
-        return hash == other.hash && 
-               height == other.height && 
-               timestamp == other.timestamp && 
-               size == other.size && 
-               weight == other.weight && 
-               longTermWeight == other.longTermWeight && 
-               depth == other.depth && 
-               difficulty == other.difficulty && 
-               cumulativeDifficulty == other.cumulativeDifficulty && 
-               majorVersion == other.majorVersion && 
-               minorVersion == other.minorVersion && 
-               nonce == other.nonce && 
-               minerTxHash == other.minerTxHash && 
-               numTxs == other.numTxs && 
-               orphanStatus == other.orphanStatus && 
-               prevHash == other.prevHash && 
-               reward == other.reward && 
+        return hash == other.hash &&
+               height == other.height &&
+               timestamp == other.timestamp &&
+               size == other.size &&
+               weight == other.weight &&
+               longTermWeight == other.longTermWeight &&
+               depth == other.depth &&
+               difficulty == other.difficulty &&
+               cumulativeDifficulty == other.cumulativeDifficulty &&
+               majorVersion == other.majorVersion &&
+               minorVersion == other.minorVersion &&
+               nonce == other.nonce &&
+               minerTxHash == other.minerTxHash &&
+               numTxs == other.numTxs &&
+               orphanStatus == other.orphanStatus &&
+               prevHash == other.prevHash &&
+               reward == other.reward &&
                powHash == other.powHash;
     }
 }

Monero/Common/MoneroUtils.cs

@@ -248,7 +248,7 @@ public static bool IsValidHex(string str)
             return false;
         }
     }
-    
+
     public static void ValidateBase58(string standardAddress)
     {
         foreach (char c in standardAddress)
@@ -257,7 +257,7 @@ public static void ValidateBase58(string standardAddress)
                 throw new MoneroError("Invalid Base58 " + standardAddress);
         }
     }
-    
+
     public static bool IsValidBase58(string standardAddress)
     {
         try
@@ -365,7 +365,7 @@ public static MoneroIntegratedAddress GetIntegratedAddress(MoneroNetworkType net
     {
         throw new NotImplementedException("MoneroUtils.GetIntegratedAddress(): not implemented.");
     }
-    
+
     public static Uri ParseUri(string uri)
     {
         if (!string.IsNullOrEmpty(uri) && !Regex.IsMatch(uri.ToLower(), @"^\w+://.+"))
@@ -503,7 +503,7 @@ private static int[] Uint64To8be(BigInteger num, int size)
         }
         return res;
     }
-    
+
     private static string BinToHex(int[] data)
     {
         var builder = new StringBuilder();
@@ -518,7 +518,7 @@ public static Dictionary<string, object> BinaryBlocksToMap(byte[] blocks)
     {
         throw new NotImplementedException("MoneroUtils.BinaryBlocksToMap(): not implemented");
     }
-    
+
     public static void MergeTx(List<MoneroTx> txs, MoneroTx tx)
     {
         foreach (MoneroTx aTx in txs)

Monero/Daemon/MoneroDaemonDefault.cs

@@ -117,7 +117,7 @@ public virtual List<MoneroDaemonListener> GetListeners()
     public virtual string? GetTxHex(string txHash, bool prune = false)
     {
         var hexes = GetTxHexes([txHash], prune);
-            
+
         return hexes.FirstOrDefault();
     }