Improve Monero.Common code quality

Author: everoddandeven

Monero/Common/GenUtils.cs

@@ -1,4 +1,5 @@
-using Org.BouncyCastle.Utilities;
+using System.Text;
+using Org.BouncyCastle.Utilities;
 
 namespace Monero.Common
 {
@@ -12,26 +13,39 @@ public static string GetGuid()
         public static T? Reconcile<T>(T? val1, T? val2, bool? resolveDefined = null, bool? resolveTrue = null, bool? resolveMax = null)
         {
             // check for same reference
-            if (ReferenceEquals(val1, val2)) return val1;
+            if (ReferenceEquals(val1, val2))
+            {
+                return val1;
+            }
 
             int? comparison = null;
 
             // check for BigInteger equality
             if (val1 is ulong b1 && val2 is ulong b2)
             {
                 comparison = b1.CompareTo(b2);
-                if (comparison == 0) return val1;
+                if (comparison == 0)
+                {
+                    return val1;
+                }
             }
 
             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)
             {
-                if (resolveDefined == false) return default!;
+                if (resolveDefined == false)
+                {
+                    return default!;
+                }
+                
                 return val1 == null ? val2 : val1;
             }
 
@@ -100,27 +114,29 @@ public static string GetGuid()
 
         public static int[]? Subarray(int[]? array, int startIndexInclusive, int endIndexExclusive)
         {
-            if (array == null) return null;
+            if (array == null)
+            {
+                return null;
+            }
+            
             if (startIndexInclusive < 0) startIndexInclusive = 0;
             if (endIndexExclusive > array.Length) endIndexExclusive = array.Length;
 
             int newSize = endIndexExclusive - startIndexInclusive;
-            if (newSize <= 0) return [];
+            if (newSize <= 0)
+            {
+                return [];
+            }
 
             int[] subarray = new int[newSize];
             Array.Copy(array, startIndexInclusive, subarray, 0, newSize);
             return subarray;
         }
-
-        public static void WaitFor(ulong durationMs) {
-            WaitFor((int)durationMs);
-        }
-
+        
         public static void WaitFor(int durationMs)
         {
             try
             {
-                // brutto, non mi piace
                 Thread.Sleep(durationMs);
             }
             catch (ThreadInterruptedException)
@@ -129,15 +145,23 @@ public static void WaitFor(int durationMs)
             }
         }
 
-        public static string KvLine(object? key, object? value, int indent, bool newline = true, bool ignoreUndefined = true) {
-            if (value == null && ignoreUndefined) return "";
+        public static string KvLine(string 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) {
-            string str = "";
-            for (int i = 0; i < length; i++) str += "  "; // two spaces
-            return str;
+        public static string GetIndent(int length)
+        {
+            var sb = new StringBuilder(length * 2);
+            for (int i = 0; i < length; i++)
+            {
+                sb.Append("  "); // two spaces
+            }
+            return sb.ToString();
         }
     }
 }

Monero/Common/MoneroBlock.cs

@@ -21,13 +21,24 @@ public MoneroBlock(MoneroBlockHeader header) : base(header)
         public MoneroBlock(MoneroBlock block) : base(block)
         {
             _hex = block.GetHex();
-            if (block._minerTx != null) _minerTx = block._minerTx.Clone().SetBlock(this);
+            if (block._minerTx != null)
+            {
+                _minerTx = block._minerTx.Clone().SetBlock(this);
+            }
+            
             if (block._txs != null)
             {
-                _txs = new List<MoneroTx>();
-                foreach (MoneroTx tx in block._txs) _txs.Add(tx.Clone().SetBlock(this));
+                _txs = [];
+                foreach (MoneroTx tx in block._txs)
+                {
+                    _txs.Add(tx.Clone().SetBlock(this));
+                }
+            }
+
+            if (block.GetTxHashes() != null)
+            {
+                _txHashes = [..block.GetTxHashes()!];
             }
-            if (block.GetTxHashes() != null) _txHashes = [..block.GetTxHashes()!];
         }
 
         #region Override Base Methods
@@ -184,8 +195,16 @@ public MoneroBlock SetTxs(List<MoneroTx>? txs)
 
         public MoneroBlock AddTx(MoneroTx? tx)
         {
-            if (tx == null) throw new ArgumentNullException(nameof(tx), "Transaction cannot be null");
-            if (_txs == null) _txs = [];
+            if (tx == null)
+            {
+                throw new ArgumentNullException(nameof(tx), "Transaction cannot be null");
+            }
+            
+            if (_txs == null)
+            {
+                _txs = [];
+            }
+            
             _txs.Add(tx.SetBlock(this));
             return this;
         }

Monero/Common/MoneroBlockHeader.cs

@@ -52,7 +52,7 @@ public MoneroBlockHeader(MoneroBlockHeader header)
 
         public virtual MoneroBlockHeader SetHash(string? hash)
         {
-            this._hash = hash;
+            _hash = hash;
             return this;
         }
 
@@ -63,7 +63,7 @@ public virtual MoneroBlockHeader SetHash(string? hash)
 
         public virtual MoneroBlockHeader SetHeight(ulong? height)
         {
-            this._height = height;
+            _height = height;
             return this;
         }
 
@@ -74,7 +74,7 @@ public virtual MoneroBlockHeader SetHeight(ulong? height)
 
         public virtual MoneroBlockHeader SetTimestamp(ulong? timestamp)
         {
-            this._timestamp = timestamp;
+            _timestamp = timestamp;
             return this;
         }
 
@@ -85,7 +85,7 @@ public virtual MoneroBlockHeader SetTimestamp(ulong? timestamp)
 
         public virtual MoneroBlockHeader SetSize(ulong? size)
         {
-            this._size = size;
+            _size = size;
             return this;
         }
 
@@ -96,7 +96,7 @@ public virtual MoneroBlockHeader SetSize(ulong? size)
 
         public virtual MoneroBlockHeader SetWeight(ulong? weight)
         {
-            this._weight = weight;
+            _weight = weight;
             return this;
         }
 
@@ -107,7 +107,7 @@ public virtual MoneroBlockHeader SetWeight(ulong? weight)
 
         public virtual MoneroBlockHeader SetLongTermWeight(ulong? longTermWeight)
         {
-            this._longTermWeight = longTermWeight;
+            _longTermWeight = longTermWeight;
             return this;
         }
 
@@ -118,7 +118,7 @@ public virtual MoneroBlockHeader SetLongTermWeight(ulong? longTermWeight)
 
         public virtual MoneroBlockHeader SetDepth(ulong? depth)
         {
-            this._depth = depth;
+            _depth = depth;
             return this;
         }
 
@@ -129,7 +129,7 @@ public virtual MoneroBlockHeader SetDepth(ulong? depth)
 
         public virtual MoneroBlockHeader SetDifficulty(ulong? difficulty)
         {
-            this._difficulty = difficulty;
+            _difficulty = difficulty;
             return this;
         }
 
@@ -140,7 +140,7 @@ public virtual MoneroBlockHeader SetDifficulty(ulong? difficulty)
 
         public virtual MoneroBlockHeader SetCumulativeDifficulty(ulong? cumulativeDifficulty)
         {
-            this._cumulativeDifficulty = cumulativeDifficulty;
+            _cumulativeDifficulty = cumulativeDifficulty;
             return this;
         }
 
@@ -151,7 +151,7 @@ public virtual MoneroBlockHeader SetCumulativeDifficulty(ulong? cumulativeDiffic
 
         public virtual MoneroBlockHeader SetMajorVersion(uint? majorVersion)
         {
-            this._majorVersion = majorVersion;
+            _majorVersion = majorVersion;
             return this;
         }
 
@@ -162,7 +162,7 @@ public virtual MoneroBlockHeader SetMajorVersion(uint? majorVersion)
 
         public virtual MoneroBlockHeader SetMinorVersion(uint? minorVersion)
         {
-            this._minorVersion = minorVersion;
+            _minorVersion = minorVersion;
             return this;
         }
 
@@ -173,7 +173,7 @@ public virtual MoneroBlockHeader SetMinorVersion(uint? minorVersion)
 
         public virtual MoneroBlockHeader SetNonce(ulong? nonce)
         {
-            this._nonce = nonce;
+            _nonce = nonce;
             return this;
         }
 
@@ -184,7 +184,7 @@ public virtual MoneroBlockHeader SetNonce(ulong? nonce)
 
         public virtual MoneroBlockHeader SetMinerTxHash(string? minerTxHash)
         {
-            this._minerTxHash = minerTxHash;
+            _minerTxHash = minerTxHash;
             return this;
         }
 
@@ -195,7 +195,7 @@ public virtual MoneroBlockHeader SetMinerTxHash(string? minerTxHash)
 
         public virtual MoneroBlockHeader SetNumTxs(uint? numTxs)
         {
-            this._numTxs = numTxs;
+            _numTxs = numTxs;
             return this;
         }
 
@@ -206,7 +206,7 @@ public virtual MoneroBlockHeader SetNumTxs(uint? numTxs)
 
         public virtual MoneroBlockHeader SetOrphanStatus(bool? orphanStatus)
         {
-            this._orphanStatus = orphanStatus;
+            _orphanStatus = orphanStatus;
             return this;
         }
 
@@ -217,7 +217,7 @@ public virtual MoneroBlockHeader SetOrphanStatus(bool? orphanStatus)
 
         public virtual MoneroBlockHeader SetPrevHash(string? prevHash)
         {
-            this._prevHash = prevHash;
+            _prevHash = prevHash;
             return this;
         }
 
@@ -228,7 +228,7 @@ public virtual MoneroBlockHeader SetPrevHash(string? prevHash)
 
         public virtual MoneroBlockHeader SetReward(ulong? reward)
         {
-            this._reward = reward;
+            _reward = reward;
             return this;
         }
 
@@ -239,38 +239,54 @@ public virtual MoneroBlockHeader SetReward(ulong? reward)
 
         public virtual MoneroBlockHeader SetPowHash(string? powHash)
         {
-            this._powHash = powHash;
+            _powHash = powHash;
             return this;
         }
 
         public virtual MoneroBlockHeader Merge(MoneroBlockHeader? header)
         {
-            if (header == null) throw new ArgumentNullException(nameof(header), "Cannot merge null header into block header");
-            if (this == header) return this;
-            this.SetHash(GenUtils.Reconcile(this.GetHash(), header.GetHash()));
-            this.SetHeight(GenUtils.Reconcile(this.GetHeight(), header.GetHeight(), null, null, true));  // height can increase
-            this.SetTimestamp(GenUtils.Reconcile(this.GetTimestamp(), header.GetTimestamp(), null, null, true));  // block timestamp can increase
-            this.SetSize(GenUtils.Reconcile(this.GetSize(), header.GetSize()));
-            this.SetWeight(GenUtils.Reconcile(this.GetWeight(), header.GetWeight()));
-            this.SetDepth(GenUtils.Reconcile(this.GetDepth(), header.GetDepth()));
-            this.SetDifficulty(GenUtils.Reconcile(this.GetDifficulty(), header.GetDifficulty()));
-            this.SetCumulativeDifficulty(GenUtils.Reconcile(this.GetCumulativeDifficulty(), header.GetCumulativeDifficulty()));
-            this.SetMajorVersion(GenUtils.Reconcile(this.GetMajorVersion(), header.GetMajorVersion()));
-            this.SetMinorVersion(GenUtils.Reconcile(this.GetMinorVersion(), header.GetMinorVersion()));
-            this.SetNonce(GenUtils.Reconcile(this.GetNonce(), header.GetNonce()));
-            this.SetMinerTxHash(GenUtils.Reconcile(this.GetMinerTxHash(), header.GetMinerTxHash()));
-            this.SetNumTxs(GenUtils.Reconcile(this.GetNumTxs(), header.GetNumTxs()));
-            this.SetOrphanStatus(GenUtils.Reconcile(this.GetOrphanStatus(), header.GetOrphanStatus()));
-            this.SetPrevHash(GenUtils.Reconcile(this.GetPrevHash(), header.GetPrevHash()));
-            this.SetReward(GenUtils.Reconcile(this.GetReward(), header.GetReward()));
-            this.SetPowHash(GenUtils.Reconcile(this.GetPowHash(), header.GetPowHash()));
+            if (header == null)
+            {
+                throw new ArgumentNullException(nameof(header), "Cannot merge null header into block header");
+            }
+            
+            if (this == header)
+            {
+                return this;
+            }
+            
+            SetHash(GenUtils.Reconcile(GetHash(), header.GetHash()));
+            SetHeight(GenUtils.Reconcile(GetHeight(), header.GetHeight(), null, null, true));  // height can increase
+            SetTimestamp(GenUtils.Reconcile(GetTimestamp(), header.GetTimestamp(), null, null, true));  // block timestamp can increase
+            SetSize(GenUtils.Reconcile(GetSize(), header.GetSize()));
+            SetWeight(GenUtils.Reconcile(GetWeight(), header.GetWeight()));
+            SetDepth(GenUtils.Reconcile(GetDepth(), header.GetDepth()));
+            SetDifficulty(GenUtils.Reconcile(GetDifficulty(), header.GetDifficulty()));
+            SetCumulativeDifficulty(GenUtils.Reconcile(GetCumulativeDifficulty(), header.GetCumulativeDifficulty()));
+            SetMajorVersion(GenUtils.Reconcile(GetMajorVersion(), header.GetMajorVersion()));
+            SetMinorVersion(GenUtils.Reconcile(GetMinorVersion(), header.GetMinorVersion()));
+            SetNonce(GenUtils.Reconcile(GetNonce(), header.GetNonce()));
+            SetMinerTxHash(GenUtils.Reconcile(GetMinerTxHash(), header.GetMinerTxHash()));
+            SetNumTxs(GenUtils.Reconcile(GetNumTxs(), header.GetNumTxs()));
+            SetOrphanStatus(GenUtils.Reconcile(GetOrphanStatus(), header.GetOrphanStatus()));
+            SetPrevHash(GenUtils.Reconcile(GetPrevHash(), header.GetPrevHash()));
+            SetReward(GenUtils.Reconcile(GetReward(), header.GetReward()));
+            SetPowHash(GenUtils.Reconcile(GetPowHash(), header.GetPowHash()));
             return this;
         }
 
         public virtual bool Equals(MoneroBlockHeader? other)
         {
-            if (other == null) return false;
-            if (other == this) return true;
+            if (other == null)
+            {
+                return false;
+            }
+
+            if (other == this)
+            {
+                return true;
+            }
+            
             return _hash == other._hash && 
                    _height == other._height && 
                    _timestamp == other._timestamp &&