Simplify null checks (#6355)

NethermindEth · Dec 12, 2023 · 9df511b · 9df511b
1 parent 6744d21
commit 9df511b
Show file tree

Hide file tree

Showing 39 changed files with 73 additions and 73 deletions.
diff --git a/src/Nethermind/Nethermind.AccountAbstraction/Source/CompareReplacedUserOperationByFee.cs b/src/Nethermind/Nethermind.AccountAbstraction/Source/CompareReplacedUserOperationByFee.cs
@@ -20,8 +20,8 @@ private CompareReplacedUserOperationByFee() { }
         public int Compare(UserOperation? x, UserOperation? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             y.MaxFeePerGas.Divide(PartOfFeeRequiredToIncrease, out UInt256 bumpMaxFeePerGas);
             if (y.MaxFeePerGas + bumpMaxFeePerGas > x.MaxFeePerGas) return 1;

diff --git a/src/Nethermind/Nethermind.AccountAbstraction/Source/CompareUserOperationByNonce.cs b/src/Nethermind/Nethermind.AccountAbstraction/Source/CompareUserOperationByNonce.cs
@@ -15,8 +15,8 @@ private CompareUserOperationByNonce() { }
         public int Compare(UserOperation? x, UserOperation? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
             return x.Nonce.CompareTo(y.Nonce);
         }
     }

diff --git a/...hermind/Nethermind.AccountAbstraction/Source/CompareUserOperationsByDecreasingGasPrice.cs b/...hermind/Nethermind.AccountAbstraction/Source/CompareUserOperationsByDecreasingGasPrice.cs
@@ -13,8 +13,8 @@ public class CompareUserOperationsByDecreasingGasPrice : IComparer<UserOperation
         public int Compare(UserOperation? x, UserOperation? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             //TODO Implement effective gas price sorting
             return y.MaxPriorityFeePerGas.CompareTo(x.MaxPriorityFeePerGas);

diff --git a/src/Nethermind/Nethermind.AccountAbstraction/Source/CompareUserOperationsByHash.cs b/src/Nethermind/Nethermind.AccountAbstraction/Source/CompareUserOperationsByHash.cs
@@ -15,8 +15,8 @@ private CompareUserOperationsByHash() { }
         public int Compare(UserOperation? x, UserOperation? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             return x.RequestId!.CompareTo(y.RequestId!);
         }

diff --git a/...Nethermind/Nethermind.AccountAbstraction/Source/CompetingUserOperationEqualityComparer.cs b/...Nethermind/Nethermind.AccountAbstraction/Source/CompetingUserOperationEqualityComparer.cs
@@ -16,8 +16,8 @@ private CompetingUserOperationEqualityComparer() { }
         public bool Equals(UserOperation? x, UserOperation? y)
         {
             if (ReferenceEquals(x, y)) return true;
-            if (ReferenceEquals(x, null)) return false;
-            if (ReferenceEquals(y, null)) return false;
+            if (x is null) return false;
+            if (y is null) return false;
             if (x.GetType() != y.GetType()) return false;
             return x.Sender.Equals(y.Sender) && x.Nonce.Equals(y.Nonce);
         }

diff --git a/src/Nethermind/Nethermind.Blockchain/Find/BlockParameter.cs b/src/Nethermind/Nethermind.Blockchain/Find/BlockParameter.cs
@@ -58,14 +58,14 @@ public BlockParameter(Hash256 blockHash, bool requireCanonical = false)
 
         public bool Equals(BlockParameter? other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
             return Type == other.Type && BlockNumber == other.BlockNumber && BlockHash == other.BlockHash && other.RequireCanonical == RequireCanonical;
         }
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != GetType()) return false;
             return Equals((BlockParameter)obj);

diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/Transactions/CompareTxByPriorityBase.cs b/src/Nethermind/Nethermind.Consensus.AuRa/Transactions/CompareTxByPriorityBase.cs
@@ -52,8 +52,8 @@ private void CheckReloadSendersWhitelist()
         public int Compare(Transaction x, Transaction y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             // we already have nonce ordered by previous code, we don't deal with it here
 

diff --git a/...Nethermind.Consensus.AuRa/Validators/ReportingContractBasedValidator.PersistentReports.cs b/...Nethermind.Consensus.AuRa/Validators/ReportingContractBasedValidator.PersistentReports.cs
@@ -153,14 +153,14 @@ public PersistentReport(Address maliciousValidator, in UInt256 blockNumber, byte
 
             public bool Equals(PersistentReport other)
             {
-                if (ReferenceEquals(null, other)) return false;
+                if (other is null) return false;
                 if (ReferenceEquals(this, other)) return true;
                 return Equals(MaliciousValidator, other.MaliciousValidator) && BlockNumber == other.BlockNumber;
             }
 
             public override bool Equals(object obj)
             {
-                if (ReferenceEquals(null, obj)) return false;
+                if (obj is null) return false;
                 if (ReferenceEquals(this, obj)) return true;
                 if (obj.GetType() != this.GetType()) return false;
                 return Equals((PersistentReport)obj);

diff --git a/src/Nethermind/Nethermind.Consensus/Comparers/GasPriceTxComparer.cs b/src/Nethermind/Nethermind.Consensus/Comparers/GasPriceTxComparer.cs
@@ -23,8 +23,8 @@ public GasPriceTxComparer(IBlockFinder blockFinder, ISpecProvider specProvider)
         public int Compare(Transaction? x, Transaction? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             // if gas bottleneck was calculated, it's highest priority for sorting
             // if not, different method of sorting by gas price is needed

diff --git a/src/Nethermind/Nethermind.Consensus/Comparers/GasPriceTxComparerHelper.cs b/src/Nethermind/Nethermind.Consensus/Comparers/GasPriceTxComparerHelper.cs
@@ -11,8 +11,8 @@ public static class GasPriceTxComparerHelper
         public static int Compare(Transaction? x, Transaction? y, in UInt256 baseFee, bool isEip1559Enabled)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             // EIP1559 changed the way we're sorting transactions. The transaction with a higher miner tip should go first
             if (isEip1559Enabled)

diff --git a/src/Nethermind/Nethermind.Core/Address.cs b/src/Nethermind/Nethermind.Core/Address.cs
@@ -123,7 +123,7 @@ public Address(byte[] bytes)
 
         public bool Equals(Address? other)
         {
-            if (ReferenceEquals(null, other))
+            if (other is null)
             {
                 return false;
             }
@@ -159,7 +159,7 @@ public static Address FromNumber(in UInt256 number)
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj is null)
             {
                 return false;
             }
@@ -293,13 +293,13 @@ public static AddressStructRef FromNumber(in UInt256 number)
         /// <returns></returns>
         public string ToString(bool withZeroX, bool withEip55Checksum) => Bytes.ToHexString(withZeroX, false, withEip55Checksum);
 
-        public bool Equals(Address? other) => !ReferenceEquals(null, other) && Nethermind.Core.Extensions.Bytes.AreEqual(Bytes, other.Bytes);
+        public bool Equals(Address? other) => other is not null && Nethermind.Core.Extensions.Bytes.AreEqual(Bytes, other.Bytes);
 
         public bool Equals(AddressStructRef other) => Nethermind.Core.Extensions.Bytes.AreEqual(Bytes, other.Bytes);
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj is null)
             {
                 return false;
             }

diff --git a/src/Nethermind/Nethermind.Core/Bloom.cs b/src/Nethermind/Nethermind.Core/Bloom.cs
@@ -100,15 +100,15 @@ public override string ToString()
 
         public bool Equals(Bloom? other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return Nethermind.Core.Extensions.Bytes.AreEqual(Bytes, other.Bytes);
         }
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != GetType()) return false;
             return Equals((Bloom)obj);
@@ -284,7 +284,7 @@ public override string ToString()
 
         public bool Equals(Bloom? other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             return Nethermind.Core.Extensions.Bytes.AreEqual(Bytes, other.Bytes);
         }
 
@@ -296,7 +296,7 @@ public bool Equals(BloomStructRef other)
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (obj.GetType() != typeof(BloomStructRef)) return false;
             return Equals((Bloom)obj);
         }

diff --git a/src/Nethermind/Nethermind.Core/Bytes32.cs b/src/Nethermind/Nethermind.Core/Bytes32.cs
@@ -87,7 +87,7 @@ public Bytes32 Xor(Bytes32 other)
 
     public bool Equals(Bytes32? other)
     {
-        if (ReferenceEquals(null, other)) return false;
+        if (other is null) return false;
         if (ReferenceEquals(this, other)) return true;
         return _bytes.SequenceEqual(other._bytes);
     }

diff --git a/src/Nethermind/Nethermind.Core/Crypto/PublicKey.cs b/src/Nethermind/Nethermind.Core/Crypto/PublicKey.cs
@@ -138,12 +138,12 @@ public string ToShortString()
 
         public static bool operator ==(PublicKey? a, PublicKey? b)
         {
-            if (ReferenceEquals(a, null))
+            if (a is null)
             {
-                return ReferenceEquals(b, null);
+                return b is null;
             }
 
-            if (ReferenceEquals(b, null))
+            if (b is null)
             {
                 return false;
             }

diff --git a/src/Nethermind/Nethermind.Core/Crypto/Root.cs b/src/Nethermind/Nethermind.Core/Crypto/Root.cs
@@ -97,7 +97,7 @@ public override string ToString()
 
     public bool Equals(Root? other)
     {
-        if (ReferenceEquals(null, other)) return false;
+        if (other is null) return false;
         if (ReferenceEquals(this, other)) return true;
         return Bytes.SequenceEqual(other.Bytes);
     }

diff --git a/src/Nethermind/Nethermind.Core/Crypto/Signature.cs b/src/Nethermind/Nethermind.Core/Crypto/Signature.cs
@@ -97,14 +97,14 @@ public override string ToString()
 
         public bool Equals(Signature? other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
             return Core.Extensions.Bytes.AreEqual(Bytes, other.Bytes) && V == other.V;
         }
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != GetType()) return false;
             return Equals((Signature)obj);

diff --git a/src/Nethermind/Nethermind.Core/StorageCell.cs b/src/Nethermind/Nethermind.Core/StorageCell.cs
@@ -47,7 +47,7 @@ public StorageCell(Address address, ValueHash256 hash)
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj is null)
             {
                 return false;
             }

diff --git a/src/Nethermind/Nethermind.Crypto/PrivateKey.cs b/src/Nethermind/Nethermind.Crypto/PrivateKey.cs
@@ -59,7 +59,7 @@ private bool Equals(PrivateKey other)
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj is null)
             {
                 return false;
             }

diff --git a/src/Nethermind/Nethermind.Facade/Filters/Topics/OrExpression.cs b/src/Nethermind/Nethermind.Facade/Filters/Topics/OrExpression.cs
@@ -71,7 +71,7 @@ public override bool Matches(ref BloomStructRef bloom)
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             return Equals(obj as OrExpression);
         }
@@ -89,7 +89,7 @@ public override int GetHashCode()
 
         public bool Equals(OrExpression? other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
             return _subexpressions.SequenceEqual(other._subexpressions);
         }

diff --git a/src/Nethermind/Nethermind.Facade/Filters/Topics/SequenceTopicsFilter.cs b/src/Nethermind/Nethermind.Facade/Filters/Topics/SequenceTopicsFilter.cs
@@ -103,7 +103,7 @@ public override bool Matches(ref BloomStructRef bloom)
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != this.GetType()) return false;
             return Equals((SequenceTopicsFilter)obj);

diff --git a/src/Nethermind/Nethermind.Facade/Filters/Topics/SpecificTopic.cs b/src/Nethermind/Nethermind.Facade/Filters/Topics/SpecificTopic.cs
@@ -41,7 +41,7 @@ private ref readonly Bloom.BloomExtract BloomExtract
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != GetType()) return false;
             return Equals((SpecificTopic)obj);

diff --git a/src/Nethermind/Nethermind.Mev/Data/MevBundle.cs b/src/Nethermind/Nethermind.Mev/Data/MevBundle.cs
@@ -43,14 +43,14 @@ public MevBundle(long blockNumber, IReadOnlyList<BundleTransaction> transactions
 
         public bool Equals(MevBundle? other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
             return Equals(Hash, other.Hash);
         }
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != GetType()) return false;
             return Equals((MevBundle)obj);

diff --git a/src/Nethermind/Nethermind.Mev/Data/MevMegabundle.cs b/src/Nethermind/Nethermind.Mev/Data/MevMegabundle.cs
@@ -33,15 +33,15 @@ public MevMegabundle(long blockNumber, IReadOnlyList<BundleTransaction> transact
 
         public bool Equals(MevMegabundle? other)
         {
-            if (ReferenceEquals(null, other)) return false;
+            if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
             return Equals(Hash, other.Hash)
                    && Equals(RelaySignature, other.RelaySignature);
         }
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != GetType()) return false;
             return Equals((MevMegabundle)obj);

diff --git a/src/Nethermind/Nethermind.Mev/Source/CompareMevBundleByBlock.cs b/src/Nethermind/Nethermind.Mev/Source/CompareMevBundleByBlock.cs
@@ -13,8 +13,8 @@ public class CompareMevBundleByBlock : IComparer<MevBundle>
         public int Compare(MevBundle? x, MevBundle? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             return x.BlockNumber.CompareTo(y.BlockNumber);
         }

diff --git a/src/Nethermind/Nethermind.Mev/Source/CompareMevBundleByHash.cs b/src/Nethermind/Nethermind.Mev/Source/CompareMevBundleByHash.cs
@@ -13,8 +13,8 @@ public class CompareMevBundleByHash : IComparer<MevBundle>
         public int Compare(MevBundle? x, MevBundle? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             return x.Hash.CompareTo(y.Hash);
         }

diff --git a/src/Nethermind/Nethermind.Mev/Source/CompareMevBundleByMinTimestamp.cs b/src/Nethermind/Nethermind.Mev/Source/CompareMevBundleByMinTimestamp.cs
@@ -13,8 +13,8 @@ public class CompareMevBundleByMinTimestamp : IComparer<MevBundle>
         public int Compare(MevBundle? x, MevBundle? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             return x.MinTimestamp.CompareTo(y.MinTimestamp);
         }

diff --git a/src/Nethermind/Nethermind.Mev/Source/CompareMevBundleBySequenceNumber.cs b/src/Nethermind/Nethermind.Mev/Source/CompareMevBundleBySequenceNumber.cs
@@ -13,8 +13,8 @@ public class CompareMevBundleBySequenceNumber : IComparer<MevBundle>
         public int Compare(MevBundle? x, MevBundle? y)
         {
             if (ReferenceEquals(x, y)) return 0;
-            if (ReferenceEquals(null, y)) return 1;
-            if (ReferenceEquals(null, x)) return -1;
+            if (y is null) return 1;
+            if (x is null) return -1;
 
             return y.SequenceNumber.CompareTo(x.SequenceNumber);
         }

diff --git a/src/Nethermind/Nethermind.Network.Discovery/DiscoveryManager.cs b/src/Nethermind/Nethermind.Network.Discovery/DiscoveryManager.cs
@@ -338,7 +338,7 @@ public bool Equals(MessageTypeKey other)
 
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
+            if (obj is null) return false;
             return obj is MessageTypeKey key && Equals(key);
         }