Clean nested blocks fix abstract constructors remove shadowing

Author: napoly

Monero.IntegrationTests/TestMoneroConnectionManager.cs

@@ -305,7 +305,10 @@ public void TestConnectionManager()
                 {
                     TestUtils.StopWalletRpcProcess(wallet);
                 }
-                catch { }
+                catch
+                {
+                    // ignore
+                }
             }
         }
     }

Monero.IntegrationTests/TestMoneroDaemonRpc.cs

@@ -1244,7 +1244,10 @@ public void TestGetMiningStatus()
         {
             // stop mining at end of test
             try { daemon.StopMining(); }
-            catch (MoneroError e) { }
+            catch (MoneroError e)
+            {
+                // ignore
+            }
         }
     }
 

Monero.IntegrationTests/TestMoneroWalletCommon.cs

@@ -5,7 +5,7 @@ namespace Monero.IntegrationTests;
 
 public class TestMoneroWalletLight : TestMoneroWalletCommon
 {
-    protected override void CloseWallet(MoneroWallet wallet, bool save)
+    protected override void CloseWallet(MoneroWallet walletInstance, bool save)
     {
         throw new NotImplementedException();
     }

Monero.IntegrationTests/TestMoneroWalletLight.cs

@@ -7,7 +7,7 @@ namespace Monero.IntegrationTests;
 
 public class TestMoneroWalletRpc : TestMoneroWalletCommon
 {
-    protected override void CloseWallet(MoneroWallet wallet, bool save)
+    protected override void CloseWallet(MoneroWallet walletInstance, bool save)
     {
         throw new NotImplementedException();
     }
@@ -45,25 +45,25 @@ protected override MoneroWallet OpenWallet(MoneroWalletConfig config)
             config.SetServer(daemon.GetRpcConnection());
         }
 
-        // create client connected to internal monero-wallet-rpc process
+        // create a client connected to an internal monero-wallet-rpc process
         bool offline = TestUtils.OFFLINE_SERVER_URI.Equals(config.GetServerUri());
-        MoneroWalletRpc wallet = TestUtils.StartWalletRpcProcess(offline);
+        MoneroWalletRpc moneroWalletRpc = TestUtils.StartWalletRpcProcess(offline);
 
         // open wallet
         try
         {
-            wallet.OpenWallet(config);
-            wallet.SetDaemonConnection(wallet.GetDaemonConnection(), true, null); // set daemon as trusted
-            if (wallet.IsConnectedToDaemon())
+            moneroWalletRpc.OpenWallet(config);
+            moneroWalletRpc.SetDaemonConnection(moneroWalletRpc.GetDaemonConnection(), true, null); // set daemon as trusted
+            if (moneroWalletRpc.IsConnectedToDaemon())
             {
-                wallet.StartSyncing((ulong)TestUtils.SYNC_PERIOD_IN_MS);
+                moneroWalletRpc.StartSyncing((ulong)TestUtils.SYNC_PERIOD_IN_MS);
             }
 
-            return wallet;
+            return moneroWalletRpc;
         }
         catch (MoneroError e)
         {
-            try { TestUtils.StopWalletRpcProcess(wallet); }
+            try { TestUtils.StopWalletRpcProcess(moneroWalletRpc); }
             catch (Exception e2) { throw new Exception(e2.Message); }
 
             throw;

Monero.IntegrationTests/TestMoneroWalletRpc.cs

@@ -17,19 +17,15 @@ public void Reset()
 
     public void WaitForWalletTxsToClearPool(MoneroWallet wallet)
     {
-        WaitForWalletTxsToClearPool([wallet]);
-    }
-
-    public void WaitForWalletTxsToClearPool(List<MoneroWallet> wallets)
-    {
+        List<MoneroWallet> wallets = [wallet];
         // get wallet tx hashes
         List<string> txHashesWallet = [];
-        foreach (MoneroWallet wallet in wallets)
+        foreach (MoneroWallet moneroWallet in wallets)
         {
-            if (!clearedWallets.Contains(wallet))
+            if (!clearedWallets.Contains(moneroWallet))
             {
-                wallet.Sync();
-                foreach (MoneroTxWallet tx in wallet.GetTxs())
+                moneroWallet.Sync();
+                foreach (MoneroTxWallet tx in moneroWallet.GetTxs())
                 {
                     string? txHash = tx.GetHash();
                     if (txHash == null)
@@ -42,7 +38,7 @@ public void WaitForWalletTxsToClearPool(List<MoneroWallet> wallets)
             }
         }
 
-        // loop until all wallet txs clear from pool
+        // loop until all wallet txs clear from the pool
         bool isFirst = true;
         bool miningStarted = false;
         MoneroDaemon daemon = TestUtils.GetDaemonRpc();
@@ -76,7 +72,7 @@ public void WaitForWalletTxsToClearPool(List<MoneroWallet> wallets)
                 break;
             }
 
-            // if first time waiting, log message and start mining
+            // if first time waiting, log a message and start mining
             if (isFirst)
             {
                 isFirst = false;
@@ -90,7 +86,10 @@ public void WaitForWalletTxsToClearPool(List<MoneroWallet> wallets)
                         StartMining.Start();
                         miningStarted = true;
                     }
-                    catch (Exception e) { } // no problem
+                    catch (Exception e)
+                    {
+                        // no problem
+                    }
                 }
             }
 
@@ -106,10 +105,10 @@ public void WaitForWalletTxsToClearPool(List<MoneroWallet> wallets)
         }
 
         // sync wallets with the pool
-        foreach (MoneroWallet wallet in wallets)
+        foreach (MoneroWallet moneroWallet in wallets)
         {
-            wallet.Sync();
-            clearedWallets.Add(wallet);
+            moneroWallet.Sync();
+            clearedWallets.Add(moneroWallet);
         }
     }
 }

Monero.IntegrationTests/Utils/WalletTxTracker.cs

@@ -2,7 +2,7 @@
 
 namespace Monero.Common;
 
-public class GenUtils
+public static class GenUtils
 {
     public static T? Reconcile<T>(T? val1, T? val2, bool? resolveDefined = null, bool? resolveTrue = null,
         bool? resolveMax = null)

Monero/Common/GenUtils.cs

@@ -11,15 +11,15 @@ public abstract class MoneroConnection
     protected ulong _timeoutMs;
     protected string? _uri;
 
-    public MoneroConnection(string? uri = null, string? proxyUri = null, int priority = 0, ulong timeoutMs = 2000)
+    protected MoneroConnection(string? uri = null, string? proxyUri = null, int priority = 0, ulong timeoutMs = 2000)
     {
         _uri = uri;
         _proxyUri = proxyUri;
         _priority = priority;
         _timeoutMs = timeoutMs;
     }
 
-    public MoneroConnection(MoneroConnection other)
+    protected MoneroConnection(MoneroConnection other)
     {
         _uri = other._uri;
         _proxyUri = other._proxyUri;

Monero/Common/MoneroConnection.cs

@@ -289,7 +289,6 @@ public MoneroConnectionManager StartPolling(ulong? periodMs = null, bool? autoSw
             case PollType.All:
                 StartPollingConnections((ulong)periodMs);
                 break;
-            case PollType.Prioritized:
             default:
                 StartPollingPrioritizedConnections((ulong)periodMs, excludedConnections);
                 break;

Monero/Common/MoneroConnectionManager.cs

@@ -11,7 +11,7 @@ public abstract class MoneroNetwork
 
     public readonly MoneroNetworkType Type;
 
-    public MoneroNetwork(int primaryAddressCode, int integratedAddressCode, int subaddressCode, MoneroNetworkType type)
+    protected MoneroNetwork(int primaryAddressCode, int integratedAddressCode, int subaddressCode, MoneroNetworkType type)
     {
         this._primaryAddressCode = primaryAddressCode;
         this._integratedAddressCode = integratedAddressCode;