Use ArgumentNullException.ThrowIfNull everywhere (btcpayserver#3239)

woutersamaey · Dec 28, 2021 · ed5b159 · ed5b159
1 parent 9b7ca76
commit ed5b159
Show file tree

Hide file tree

Showing 50 changed files with 122 additions and 244 deletions.
diff --git a/BTCPayServer.Abstractions/Security/ContentSecurityPolicies.cs b/BTCPayServer.Abstractions/Security/ContentSecurityPolicies.cs
@@ -96,8 +96,7 @@ public void AllowUnsafeHashes(string script = null)
         /// <param name="script"></param>
         public void AllowInline(string script)
         {
-            if (script is null)
-                throw new ArgumentNullException(nameof(script));
+            ArgumentNullException.ThrowIfNull(script);
             var sha = GetSha256(script);
             Add("script-src", $"'sha256-{sha}'");
         }

diff --git a/BTCPayServer.Common/BTCPayNetworkProvider.cs b/BTCPayServer.Common/BTCPayNetworkProvider.cs
@@ -121,8 +121,7 @@ public BTCPayNetworkBase GetNetwork(string cryptoCode)
         }
         public T GetNetwork<T>(string cryptoCode) where T : BTCPayNetworkBase
         {
-            if (cryptoCode == null)
-                throw new ArgumentNullException(nameof(cryptoCode));
+            ArgumentNullException.ThrowIfNull(cryptoCode);
             if (!_Networks.TryGetValue(cryptoCode.ToUpperInvariant(), out BTCPayNetworkBase network))
             {
                 if (cryptoCode == "XBT")

diff --git a/BTCPayServer.Rating/CurrencyNameTable.cs b/BTCPayServer.Rating/CurrencyNameTable.cs
@@ -145,8 +145,7 @@ static CurrencyData[] LoadCurrency()
 
         public CurrencyData GetCurrencyData(string currency, bool useFallback)
         {
-            if (currency == null)
-                throw new ArgumentNullException(nameof(currency));
+            ArgumentNullException.ThrowIfNull(currency);
             CurrencyData result;
             if (!_Currencies.TryGetValue(currency.ToUpperInvariant(), out result))
             {

diff --git a/BTCPayServer.Rating/CurrencyPair.cs b/BTCPayServer.Rating/CurrencyPair.cs
@@ -7,10 +7,8 @@ public class CurrencyPair
     {
         public CurrencyPair(string left, string right)
         {
-            if (right == null)
-                throw new ArgumentNullException(nameof(right));
-            if (left == null)
-                throw new ArgumentNullException(nameof(left));
+            ArgumentNullException.ThrowIfNull(right);
+            ArgumentNullException.ThrowIfNull(left);
             Right = right.ToUpperInvariant();
             Left = left.ToUpperInvariant();
         }
@@ -25,8 +23,7 @@ public static CurrencyPair Parse(string str)
         }
         public static bool TryParse(string str, out CurrencyPair value)
         {
-            if (str == null)
-                throw new ArgumentNullException(nameof(str));
+            ArgumentNullException.ThrowIfNull(str);
             value = null;
             str = str.Trim();
             if (str.Length > 12)

diff --git a/BTCPayServer.Rating/ExchangeRates.cs b/BTCPayServer.Rating/ExchangeRates.cs
@@ -232,10 +232,8 @@ public class PairRate
     {
         public PairRate(CurrencyPair currencyPair, BidAsk bidAsk)
         {
-            if (currencyPair == null)
-                throw new ArgumentNullException(nameof(currencyPair));
-            if (bidAsk == null)
-                throw new ArgumentNullException(nameof(bidAsk));
+            ArgumentNullException.ThrowIfNull(currencyPair);
+            ArgumentNullException.ThrowIfNull(bidAsk);
             this.CurrencyPair = currencyPair;
             this.BidAsk = bidAsk;
         }

diff --git a/BTCPayServer.Rating/Providers/BackgroundFetcherRateProvider.cs b/BTCPayServer.Rating/Providers/BackgroundFetcherRateProvider.cs
@@ -85,8 +85,7 @@ internal PairRate[] GetResult()
 
         public BackgroundFetcherRateProvider(IRateProvider inner)
         {
-            if (inner == null)
-                throw new ArgumentNullException(nameof(inner));
+            ArgumentNullException.ThrowIfNull(inner);
             _Inner = inner;
         }
 

diff --git a/BTCPayServer.Rating/Providers/ExchangeSharpRateProvider.cs b/BTCPayServer.Rating/Providers/ExchangeSharpRateProvider.cs
@@ -15,8 +15,7 @@ namespace BTCPayServer.Services.Rates
         readonly HttpClient _httpClient;
         public ExchangeSharpRateProvider(HttpClient httpClient, bool reverseCurrencyPair = false)
         {
-            if (httpClient == null)
-                throw new ArgumentNullException(nameof(httpClient));
+            ArgumentNullException.ThrowIfNull(httpClient);
             ReverseCurrencyPair = reverseCurrencyPair;
             _httpClient = httpClient;
         }

diff --git a/BTCPayServer.Rating/Providers/FallbackRateProvider.cs b/BTCPayServer.Rating/Providers/FallbackRateProvider.cs
@@ -11,8 +11,7 @@ public class FallbackRateProvider : IRateProvider
         readonly IRateProvider[] _Providers;
         public FallbackRateProvider(IRateProvider[] providers)
         {
-            if (providers == null)
-                throw new ArgumentNullException(nameof(providers));
+            ArgumentNullException.ThrowIfNull(providers);
             _Providers = providers;
         }
 

diff --git a/BTCPayServer.Rating/Providers/HttpClientRequestMaker.cs b/BTCPayServer.Rating/Providers/HttpClientRequestMaker.cs
@@ -96,10 +96,8 @@ public IReadOnlyList<string> GetHeader(string name)
 
         public HttpClientRequestMaker(IAPIRequestHandler api, HttpClient httpClient, CancellationToken cancellationToken)
         {
-            if (api == null)
-                throw new ArgumentNullException(nameof(api));
-            if (httpClient == null)
-                throw new ArgumentNullException(nameof(httpClient));
+            ArgumentNullException.ThrowIfNull(api);
+            ArgumentNullException.ThrowIfNull(httpClient);
             this.api = api;
             _httpClient = httpClient;
             _cancellationToken = cancellationToken;

diff --git a/BTCPayServer.Rating/Services/RateFetcher.cs b/BTCPayServer.Rating/Services/RateFetcher.cs
@@ -41,8 +41,7 @@ public async Task<RateResult> FetchRate(CurrencyPair pair, RateRules rules, Canc
 
         public Dictionary<CurrencyPair, Task<RateResult>> FetchRates(HashSet<CurrencyPair> pairs, RateRules rules, CancellationToken cancellationToken)
         {
-            if (rules == null)
-                throw new ArgumentNullException(nameof(rules));
+            ArgumentNullException.ThrowIfNull(rules);
 
             var fetchingRates = new Dictionary<CurrencyPair, Task<RateResult>>();
             var fetchingExchanges = new Dictionary<string, Task<QueryRateResult>>();
@@ -67,8 +66,7 @@ public Dictionary<CurrencyPair, Task<RateResult>> FetchRates(HashSet<CurrencyPai
 
         public Task<RateResult> FetchRate(RateRule rateRule, CancellationToken cancellationToken)
         {
-            if (rateRule == null)
-                throw new ArgumentNullException(nameof(rateRule));
+            ArgumentNullException.ThrowIfNull(rateRule);
             var fetchingExchanges = new Dictionary<string, Task<QueryRateResult>>();
             var dependentQueries = new List<Task<QueryRateResult>>();
             foreach (var requiredExchange in rateRule.ExchangeRates)

diff --git a/BTCPayServer/Configuration/ExternalConnectionString.cs b/BTCPayServer/Configuration/ExternalConnectionString.cs
@@ -147,8 +147,7 @@ public ExternalConnectionString Clone()
         }
         public static bool TryParse(string str, out ExternalConnectionString result, out string error)
         {
-            if (str == null)
-                throw new ArgumentNullException(nameof(str));
+            ArgumentNullException.ThrowIfNull(str);
             error = null;
             result = null;
             var resultTemp = new ExternalConnectionString();

diff --git a/BTCPayServer/Controllers/Macaroons.cs b/BTCPayServer/Controllers/Macaroons.cs
@@ -19,8 +19,7 @@ public Macaroon(byte[] bytes)
         }
         public static async Task<Macaroons> GetFromDirectoryAsync(string directoryPath)
         {
-            if (directoryPath == null)
-                throw new ArgumentNullException(nameof(directoryPath));
+            ArgumentNullException.ThrowIfNull(directoryPath);
             Macaroons macaroons = new Macaroons();
             if (!Directory.Exists(directoryPath))
                 throw new DirectoryNotFoundException("Macaroons directory not found");

diff --git a/BTCPayServer/Data/Payouts/BitcoinLike/AddressClaimDestination.cs b/BTCPayServer/Data/Payouts/BitcoinLike/AddressClaimDestination.cs
@@ -9,8 +9,7 @@ public class AddressClaimDestination : IBitcoinLikeClaimDestination
 
         public AddressClaimDestination(BitcoinAddress bitcoinAddress)
         {
-            if (bitcoinAddress == null)
-                throw new ArgumentNullException(nameof(bitcoinAddress));
+            ArgumentNullException.ThrowIfNull(bitcoinAddress);
             _bitcoinAddress = bitcoinAddress;
         }
         public BitcoinAddress Address => _bitcoinAddress;

diff --git a/BTCPayServer/Data/Payouts/BitcoinLike/UriClaimDestination.cs b/BTCPayServer/Data/Payouts/BitcoinLike/UriClaimDestination.cs
@@ -11,8 +11,7 @@ public class UriClaimDestination : IBitcoinLikeClaimDestination
 
         public UriClaimDestination(BitcoinUrlBuilder bitcoinUrl)
         {
-            if (bitcoinUrl == null)
-                throw new ArgumentNullException(nameof(bitcoinUrl));
+            ArgumentNullException.ThrowIfNull(bitcoinUrl);
             if (bitcoinUrl.Address is null)
                 throw new ArgumentException(nameof(bitcoinUrl));
             _bitcoinUrl = bitcoinUrl;

diff --git a/BTCPayServer/Data/StoreDataExtensions.cs b/BTCPayServer/Data/StoreDataExtensions.cs
@@ -68,8 +68,7 @@ public static bool SetStoreBlob(this StoreData storeData, StoreBlob storeBlob)
 
         public static IEnumerable<ISupportedPaymentMethod> GetSupportedPaymentMethods(this StoreData storeData, BTCPayNetworkProvider networks)
         {
-            if (storeData == null)
-                throw new ArgumentNullException(nameof(storeData));
+            ArgumentNullException.ThrowIfNull(storeData);
 #pragma warning disable CS0618
             bool btcReturned = false;
 

diff --git a/BTCPayServer/DerivationSchemeParser.cs b/BTCPayServer/DerivationSchemeParser.cs
@@ -15,8 +15,7 @@ public class DerivationSchemeParser
 
         public DerivationSchemeParser(BTCPayNetwork expectedNetwork)
         {
-            if (expectedNetwork == null)
-                throw new ArgumentNullException(nameof(expectedNetwork));
+            ArgumentNullException.ThrowIfNull(expectedNetwork);
             BtcPayNetwork = expectedNetwork;
         }
 
@@ -44,8 +43,7 @@ public DerivationSchemeParser(BTCPayNetwork expectedNetwork)
                 }
             }
 
-            if (str == null)
-                throw new ArgumentNullException(nameof(str));
+            ArgumentNullException.ThrowIfNull(str);
             str = str.Trim();
             var outputDescriptor = OutputDescriptor.Parse(str, Network);
             switch(outputDescriptor)
@@ -95,8 +93,7 @@ public DerivationSchemeParser(BTCPayNetwork expectedNetwork)
         public DerivationStrategyBase ParseElectrum(string str)
         {
 
-            if (str == null)
-                throw new ArgumentNullException(nameof(str));
+            ArgumentNullException.ThrowIfNull(str);
             str = str.Trim();
             var data = Network.GetBase58CheckEncoder().DecodeData(str);
             if (data.Length < 4)
@@ -123,8 +120,7 @@ public DerivationStrategyBase ParseElectrum(string str)
 
         public DerivationStrategyBase Parse(string str)
         {
-            if (str == null)
-                throw new ArgumentNullException(nameof(str));
+            ArgumentNullException.ThrowIfNull(str);
             str = str.Trim();
 
             HashSet<string> hintedLabels = new HashSet<string>();

diff --git a/BTCPayServer/DerivationSchemeSettings.cs b/BTCPayServer/DerivationSchemeSettings.cs
@@ -15,10 +15,8 @@ public class DerivationSchemeSettings : ISupportedPaymentMethod
     {
         public static DerivationSchemeSettings Parse(string derivationStrategy, BTCPayNetwork network)
         {
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
-            if (derivationStrategy == null)
-                throw new ArgumentNullException(nameof(derivationStrategy));
+            ArgumentNullException.ThrowIfNull(network);
+            ArgumentNullException.ThrowIfNull(derivationStrategy);
             var result = new DerivationSchemeSettings();
             result.Network = network;
             var parser = new DerivationSchemeParser(network);
@@ -32,10 +30,8 @@ public static DerivationSchemeSettings Parse(string derivationStrategy, BTCPayNe
 
         public static bool TryParseFromJson(string config, BTCPayNetwork network, out DerivationSchemeSettings strategy)
         {
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
-            if (config == null)
-                throw new ArgumentNullException(nameof(config));
+            ArgumentNullException.ThrowIfNull(network);
+            ArgumentNullException.ThrowIfNull(config);
             strategy = null;
             try
             {
@@ -90,10 +86,8 @@ private static bool TryParseXpub(string xpub, DerivationSchemeParser derivationS
         public static bool TryParseFromWalletFile(string fileContents, BTCPayNetwork network, out DerivationSchemeSettings settings)
         {
             settings = null;
-            if (fileContents == null)
-                throw new ArgumentNullException(nameof(fileContents));
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
+            ArgumentNullException.ThrowIfNull(fileContents);
+            ArgumentNullException.ThrowIfNull(network);
             var result = new DerivationSchemeSettings();
             var derivationSchemeParser = new DerivationSchemeParser(network);
             JObject jobj = null;
@@ -247,10 +241,8 @@ public DerivationSchemeSettings()
 
         public DerivationSchemeSettings(DerivationStrategyBase derivationStrategy, BTCPayNetwork network)
         {
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
-            if (derivationStrategy == null)
-                throw new ArgumentNullException(nameof(derivationStrategy));
+            ArgumentNullException.ThrowIfNull(network);
+            ArgumentNullException.ThrowIfNull(derivationStrategy);
             AccountDerivation = derivationStrategy;
             Network = network;
             AccountKeySettings = derivationStrategy.GetExtPubKeys().Select(c => new AccountKeySettings()

diff --git a/BTCPayServer/EventAggregator.cs b/BTCPayServer/EventAggregator.cs
@@ -81,8 +81,7 @@ public void Publish<T>(T evt) where T : class
 
         public void Publish(object evt, Type evtType)
         {
-            if (evt == null)
-                throw new ArgumentNullException(nameof(evt));
+            ArgumentNullException.ThrowIfNull(evt);
             List<Action<object>> actionList = new List<Action<object>>();
             lock (_Subscriptions)
             {

diff --git a/BTCPayServer/Events/InvoiceNeedUpdateEvent.cs b/BTCPayServer/Events/InvoiceNeedUpdateEvent.cs
@@ -6,8 +6,7 @@ public class InvoiceNeedUpdateEvent
     {
         public InvoiceNeedUpdateEvent(string invoiceId)
         {
-            if (invoiceId == null)
-                throw new ArgumentNullException(nameof(invoiceId));
+            ArgumentNullException.ThrowIfNull(invoiceId);
             InvoiceId = invoiceId;
         }
 

diff --git a/BTCPayServer/ExplorerClientProvider.cs b/BTCPayServer/ExplorerClientProvider.cs
@@ -83,8 +83,7 @@ public ExplorerClient GetExplorerClient(string cryptoCode)
 
         public ExplorerClient GetExplorerClient(BTCPayNetworkBase network)
         {
-            if (network == null)
-                throw new ArgumentNullException(nameof(network));
+            ArgumentNullException.ThrowIfNull(network);
             return GetExplorerClient(network.CryptoCode);
         }
 

diff --git a/BTCPayServer/Extensions.cs b/BTCPayServer/Extensions.cs
@@ -215,8 +215,7 @@ public static void SetHeader(this HttpResponse resp, string name, string value)
 
         public static bool IsLocalNetwork(string server)
         {
-            if (server == null)
-                throw new ArgumentNullException(nameof(server));
+            ArgumentNullException.ThrowIfNull(server);
             if (Uri.CheckHostName(server) == UriHostNameType.Dns)
             {
                 return server.EndsWith(".internal", StringComparison.OrdinalIgnoreCase) ||

diff --git a/BTCPayServer/Extensions/SSHClientExtensions.cs b/BTCPayServer/Extensions/SSHClientExtensions.cs
@@ -10,8 +10,7 @@ public static class SSHClientExtensions
     {
         public static async Task<SshClient> ConnectAsync(this SSHSettings sshSettings, CancellationToken cancellationToken = default)
         {
-            if (sshSettings == null)
-                throw new ArgumentNullException(nameof(sshSettings));
+            ArgumentNullException.ThrowIfNull(sshSettings);
             TaskCompletionSource<SshClient> tcs = new TaskCompletionSource<SshClient>(TaskCreationOptions.RunContinuationsAsynchronously);
             new Thread(() =>
             {
@@ -58,10 +57,8 @@ public static string EscapeSingleQuotes(this string command)
 
         public static Task<SSHCommandResult> RunBash(this SshClient sshClient, string command, TimeSpan? timeout = null)
         {
-            if (sshClient == null)
-                throw new ArgumentNullException(nameof(sshClient));
-            if (command == null)
-                throw new ArgumentNullException(nameof(command));
+            ArgumentNullException.ThrowIfNull(sshClient);
+            ArgumentNullException.ThrowIfNull(command);
             command = $"bash -c '{command.EscapeSingleQuotes()}'";
             var sshCommand = sshClient.CreateCommand(command);
             if (timeout is TimeSpan v)
@@ -106,8 +103,7 @@ private static SSHCommandResult CreateSSHCommandResult(SshCommand sshCommand)
 
         public static async Task DisconnectAsync(this SshClient sshClient, CancellationToken cancellationToken = default)
         {
-            if (sshClient == null)
-                throw new ArgumentNullException(nameof(sshClient));
+            ArgumentNullException.ThrowIfNull(sshClient);
 
             TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             new Thread(() =>

diff --git a/BTCPayServer/HostedServices/InvoiceWatcher.cs b/BTCPayServer/HostedServices/InvoiceWatcher.cs
@@ -235,8 +235,7 @@ public static PaymentMethod GetNearestClearedPayment(PaymentMethodDictionary all
 
         private void Watch(string invoiceId)
         {
-            if (invoiceId == null)
-                throw new ArgumentNullException(nameof(invoiceId));
+            ArgumentNullException.ThrowIfNull(invoiceId);
 
             if (!_WatchRequests.Writer.TryWrite(invoiceId))
             {