mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-20 13:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use ArgumentNullException.ThrowIfNull everywhere (#3239)

Browse source
This commit is contained in:
Nicolas Dorier 2021-12-28 17:39:54 +09:00 • committed by GitHub
parent 9b7ca76b99
commit ed5b159fb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 122 additions and 244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BTCPayServer.Abstractions/Security/ContentSecurityPolicies.cs
View file

@ -96,8 +96,7 @@ namespace BTCPayServer.Security
/// <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}'");
}

3
BTCPayServer.Common/BTCPayNetworkProvider.cs
View file

@ -121,8 +121,7 @@ namespace BTCPayServer
}
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")

3
BTCPayServer.Rating/CurrencyNameTable.cs
View file

@ -145,8 +145,7 @@ namespace BTCPayServer.Services.Rates
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))
{

9
BTCPayServer.Rating/CurrencyPair.cs
View file

@ -7,10 +7,8 @@ namespace BTCPayServer.Rating
{
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 @@ namespace BTCPayServer.Rating
}
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)

6
BTCPayServer.Rating/ExchangeRates.cs
View file

@ -232,10 +232,8 @@ namespace BTCPayServer.Rating
{
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;
}

3
BTCPayServer.Rating/Providers/BackgroundFetcherRateProvider.cs
View file

@ -85,8 +85,7 @@ namespace BTCPayServer.Services.Rates
public BackgroundFetcherRateProvider(IRateProvider inner)
{
if (inner == null)
throw new ArgumentNullException(nameof(inner));
ArgumentNullException.ThrowIfNull(inner);
_Inner = inner;
}

3
BTCPayServer.Rating/Providers/ExchangeSharpRateProvider.cs
View file

@ -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;
}

3
BTCPayServer.Rating/Providers/FallbackRateProvider.cs
View file

@ -11,8 +11,7 @@ namespace BTCPayServer.Services.Rates
readonly IRateProvider[] _Providers;
public FallbackRateProvider(IRateProvider[] providers)
{
if (providers == null)
throw new ArgumentNullException(nameof(providers));
ArgumentNullException.ThrowIfNull(providers);
_Providers = providers;
}

6
BTCPayServer.Rating/Providers/HttpClientRequestMaker.cs
View file

@ -96,10 +96,8 @@ namespace BTCPayServer.Services.Rates
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;

6
BTCPayServer.Rating/Services/RateFetcher.cs
View file

@ -41,8 +41,7 @@ namespace BTCPayServer.Services.Rates
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 @@ namespace BTCPayServer.Services.Rates
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)

3
BTCPayServer/Configuration/ExternalConnectionString.cs
View file

@ -147,8 +147,7 @@ namespace BTCPayServer.Configuration
}
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();

3
BTCPayServer/Controllers/Macaroons.cs
View file

@ -19,8 +19,7 @@ namespace BTCPayServer.Controllers
}
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");

3
BTCPayServer/Data/Payouts/BitcoinLike/AddressClaimDestination.cs
View file

@ -9,8 +9,7 @@ namespace BTCPayServer.Data
public AddressClaimDestination(BitcoinAddress bitcoinAddress)
{
if (bitcoinAddress == null)
throw new ArgumentNullException(nameof(bitcoinAddress));
ArgumentNullException.ThrowIfNull(bitcoinAddress);
_bitcoinAddress = bitcoinAddress;
}
public BitcoinAddress Address => _bitcoinAddress;

3
BTCPayServer/Data/Payouts/BitcoinLike/UriClaimDestination.cs
View file

@ -11,8 +11,7 @@ namespace BTCPayServer.Data
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;

3
BTCPayServer/Data/StoreDataExtensions.cs
View file

@ -68,8 +68,7 @@ namespace BTCPayServer.Data
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;

12
BTCPayServer/DerivationSchemeParser.cs
View file

@ -15,8 +15,7 @@ namespace BTCPayServer
public DerivationSchemeParser(BTCPayNetwork expectedNetwork)
{
if (expectedNetwork == null)
throw new ArgumentNullException(nameof(expectedNetwork));
ArgumentNullException.ThrowIfNull(expectedNetwork);
BtcPayNetwork = expectedNetwork;
}
@ -44,8 +43,7 @@ namespace BTCPayServer
}
}
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 @@ namespace BTCPayServer
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 @@ namespace BTCPayServer
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>();

24
BTCPayServer/DerivationSchemeSettings.cs
View file

@ -15,10 +15,8 @@ namespace BTCPayServer
{
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 @@ namespace BTCPayServer
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 @@ namespace BTCPayServer
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 @@ namespace BTCPayServer
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()

3
BTCPayServer/EventAggregator.cs
View file

@ -81,8 +81,7 @@ namespace BTCPayServer
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)
{

3
BTCPayServer/Events/InvoiceNeedUpdateEvent.cs
View file

@ -6,8 +6,7 @@ namespace BTCPayServer.Events
{
public InvoiceNeedUpdateEvent(string invoiceId)
{
if (invoiceId == null)
throw new ArgumentNullException(nameof(invoiceId));
ArgumentNullException.ThrowIfNull(invoiceId);
InvoiceId = invoiceId;
}

3
BTCPayServer/ExplorerClientProvider.cs
View file

@ -83,8 +83,7 @@ namespace BTCPayServer
public ExplorerClient GetExplorerClient(BTCPayNetworkBase network)
{
if (network == null)
throw new ArgumentNullException(nameof(network));
ArgumentNullException.ThrowIfNull(network);
return GetExplorerClient(network.CryptoCode);
}

3
BTCPayServer/Extensions.cs
View file

@ -215,8 +215,7 @@ namespace BTCPayServer
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) ||

12
BTCPayServer/Extensions/SSHClientExtensions.cs
View file

@ -10,8 +10,7 @@ namespace BTCPayServer
{
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 @@ namespace BTCPayServer
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 @@ namespace BTCPayServer
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(() =>

3
BTCPayServer/HostedServices/InvoiceWatcher.cs
View file

@ -235,8 +235,7 @@ namespace BTCPayServer.HostedServices
private void Watch(string invoiceId)
{
if (invoiceId == null)
throw new ArgumentNullException(nameof(invoiceId));
ArgumentNullException.ThrowIfNull(invoiceId);
if (!_WatchRequests.Writer.TryWrite(invoiceId))
{

21
BTCPayServer/HostedServices/PullPaymentHostedService.cs
View file

@ -41,14 +41,12 @@ namespace BTCPayServer.HostedServices
{
public CancelRequest(string pullPaymentId)
{
if (pullPaymentId == null)
throw new ArgumentNullException(nameof(pullPaymentId));
ArgumentNullException.ThrowIfNull(pullPaymentId);
PullPaymentId = pullPaymentId;
}
public CancelRequest(string[] payoutIds)
{
if (payoutIds == null)
throw new ArgumentNullException(nameof(payoutIds));
ArgumentNullException.ThrowIfNull(payoutIds);
PayoutIds = payoutIds;
}
public string PullPaymentId { get; set; }
@ -91,8 +89,7 @@ namespace BTCPayServer.HostedServices
}
public async Task<string> CreatePullPayment(CreatePullPayment create)
{
if (create == null)
throw new ArgumentNullException(nameof(create));
ArgumentNullException.ThrowIfNull(create);
if (create.Amount <= 0.0m)
throw new ArgumentException("Amount out of bound", nameof(create));
using var ctx = this._dbContextFactory.CreateContext();
@ -137,10 +134,8 @@ namespace BTCPayServer.HostedServices
{
public PayoutRequest(TaskCompletionSource<ClaimRequest.ClaimResponse> completionSource, ClaimRequest request)
{
if (request == null)
throw new ArgumentNullException(nameof(request));
if (completionSource == null)
throw new ArgumentNullException(nameof(completionSource));
ArgumentNullException.ThrowIfNull(request);
ArgumentNullException.ThrowIfNull(completionSource);
Completion = completionSource;
ClaimRequest = request;
}
@ -536,10 +531,8 @@ namespace BTCPayServer.HostedServices
{
public InternalPayoutPaidRequest(TaskCompletionSource<PayoutPaidRequest.PayoutPaidResult> completionSource, PayoutPaidRequest request)
{
if (request == null)
throw new ArgumentNullException(nameof(request));
if (completionSource == null)
throw new ArgumentNullException(nameof(completionSource));
ArgumentNullException.ThrowIfNull(request);
ArgumentNullException.ThrowIfNull(completionSource);
Completion = completionSource;
Request = request;
}

3
BTCPayServer/Models/GetTokensResponse.cs
View file

@ -16,8 +16,7 @@ namespace BTCPayServer.Models
readonly BitTokenEntity[] _Tokens;
public GetTokensResponse(BitTokenEntity[] tokens)
{
if (tokens == null)
throw new ArgumentNullException(nameof(tokens));
ArgumentNullException.ThrowIfNull(tokens);
this._Tokens = tokens;
}

15
BTCPayServer/Payments/IPaymentFilter.cs
View file

@ -83,16 +83,13 @@ namespace BTCPayServer.Payments
}
public static IPaymentFilter Where(Func<PaymentMethodId, bool> predicate)
{
if (predicate == null)
throw new ArgumentNullException(nameof(predicate));
ArgumentNullException.ThrowIfNull(predicate);
return new PredicateFilter(predicate);
}
public static IPaymentFilter Or(IPaymentFilter a, IPaymentFilter b)
{
if (a == null)
throw new ArgumentNullException(nameof(a));
if (b == null)
throw new ArgumentNullException(nameof(b));
ArgumentNullException.ThrowIfNull(a);
ArgumentNullException.ThrowIfNull(b);
return new OrPaymentFilter(a, b);
}
public static IPaymentFilter Never()
@ -101,14 +98,12 @@ namespace BTCPayServer.Payments
}
public static IPaymentFilter Any(IPaymentFilter[] filters)
{
if (filters == null)
throw new ArgumentNullException(nameof(filters));
ArgumentNullException.ThrowIfNull(filters);
return new CompositePaymentFilter(filters);
}
public static IPaymentFilter WhereIs(PaymentMethodId paymentMethodId)
{
if (paymentMethodId == null)
throw new ArgumentNullException(nameof(paymentMethodId));
ArgumentNullException.ThrowIfNull(paymentMethodId);
return new PaymentIdFilter(paymentMethodId);
}
}

3
BTCPayServer/Payments/Lightning/LightningListener.cs
View file

@ -415,8 +415,7 @@ namespace BTCPayServer.Payments.Lightning
PaymentService paymentService,
Logs logs)
{
if (connectionString == null)
throw new ArgumentNullException(nameof(connectionString));
ArgumentNullException.ThrowIfNull(connectionString);
Logs = logs;
this._invoiceRepository = invoiceRepository;
_eventAggregator = eventAggregator;

3
BTCPayServer/Payments/Lightning/LightningSupportedPaymentMethod.cs
View file

@ -37,8 +37,7 @@ namespace BTCPayServer.Payments.Lightning
public void SetLightningUrl(LightningConnectionString connectionString)
{
if (connectionString == null)
throw new ArgumentNullException(nameof(connectionString));
ArgumentNullException.ThrowIfNull(connectionString);
#pragma warning disable CS0618 // Type or member is obsolete
LightningConnectionString = connectionString.ToString();
#pragma warning restore CS0618 // Type or member is obsolete

6
BTCPayServer/Payments/PayJoin/PayJoinEndpointController.cs
View file

@ -59,10 +59,8 @@ namespace BTCPayServer.Payments.PayJoin
public static UTXODeterministicComparer Instance => _Instance;
public int Compare([AllowNull] UTXO x, [AllowNull] UTXO y)
{
if (x == null)
throw new ArgumentNullException(nameof(x));
if (y == null)
throw new ArgumentNullException(nameof(y));
ArgumentNullException.ThrowIfNull(x);
ArgumentNullException.ThrowIfNull(y);
Span<byte> tmpx = stackalloc byte[32];
Span<byte> tmpy = stackalloc byte[32];
x.Outpoint.Hash.ToBytes(tmpx);

9
BTCPayServer/Payments/PaymentMethodId.cs
View file

@ -13,17 +13,14 @@ namespace BTCPayServer.Payments
{
public PaymentMethodId? FindNearest(PaymentMethodId[] others)
{
if (others is null)
throw new ArgumentNullException(nameof(others));
ArgumentNullException.ThrowIfNull(others);
return others.FirstOrDefault(f => f == this) ??
others.FirstOrDefault(f => f.CryptoCode == CryptoCode);
}
public PaymentMethodId(string cryptoCode, PaymentType paymentType)
{
if (cryptoCode == null)
throw new ArgumentNullException(nameof(cryptoCode));
if (paymentType == null)
throw new ArgumentNullException(nameof(paymentType));
ArgumentNullException.ThrowIfNull(cryptoCode);
ArgumentNullException.ThrowIfNull(paymentType);
PaymentType = paymentType;
CryptoCode = cryptoCode.ToUpperInvariant();
}

9
BTCPayServer/Payments/PaymentTypes.Bitcoin.cs
View file

@ -44,10 +44,8 @@ namespace BTCPayServer.Payments
public override ISupportedPaymentMethod DeserializeSupportedPaymentMethod(BTCPayNetworkBase network, JToken value)
{
if (network == null)
throw new ArgumentNullException(nameof(network));
if (value == null)
throw new ArgumentNullException(nameof(value));
ArgumentNullException.ThrowIfNull(network);
ArgumentNullException.ThrowIfNull(value);
var net = (BTCPayNetwork)network;
if (value is JObject jobj)
{
@ -61,8 +59,7 @@ namespace BTCPayServer.Payments
public override string GetTransactionLink(BTCPayNetworkBase network, string txId)
{
if (txId == null)
throw new ArgumentNullException(nameof(txId));
ArgumentNullException.ThrowIfNull(txId);
if (network?.BlockExplorerLink == null)
return null;
txId = txId.Split('-').First();

9
BTCPayServer/SSH/SSHFingerprint.cs
View file

@ -10,8 +10,7 @@ namespace BTCPayServer.SSH
{
public static bool TryParse(string str, out SSHFingerprint fingerPrint)
{
if (str == null)
throw new ArgumentNullException(nameof(str));
ArgumentNullException.ThrowIfNull(str);
fingerPrint = null;
str = str.Trim();
try
@ -77,10 +76,8 @@ namespace BTCPayServer.SSH
public bool Match(byte[] shortFingerprint, byte[] hostKey)
{
if (shortFingerprint == null)
throw new ArgumentNullException(nameof(shortFingerprint));
if (hostKey == null)
throw new ArgumentNullException(nameof(hostKey));
ArgumentNullException.ThrowIfNull(shortFingerprint);
ArgumentNullException.ThrowIfNull(hostKey);
if (_ShortFingerprint != null)
return Utils.ArrayEqual(shortFingerprint, _ShortFingerprint);
return Utils.ArrayEqual(_FullHash, NBitcoin.Crypto.Hashes.SHA256(hostKey));

3
BTCPayServer/Security/Bitpay/TokenRepository.cs
View file

@ -21,8 +21,7 @@ namespace BTCPayServer.Security.Bitpay
readonly ApplicationDbContextFactory _Factory;
public TokenRepository(ApplicationDbContextFactory dbFactory)
{
if (dbFactory == null)
throw new ArgumentNullException(nameof(dbFactory));
ArgumentNullException.ThrowIfNull(dbFactory);
_Factory = dbFactory;
}

3
BTCPayServer/Security/PolicyRequirement.cs
View file

@ -7,8 +7,7 @@ namespace BTCPayServer.Security
{
public PolicyRequirement(string policy)
{
if (policy == null)
throw new ArgumentNullException(nameof(policy));
ArgumentNullException.ThrowIfNull(policy);
Policy = policy;
}
public string Policy { get; }

9
BTCPayServer/Services/BTCPayNetworkJsonSerializerSettings.cs
View file

@ -45,20 +45,17 @@ namespace BTCPayServer.Services
public JsonSerializerSettings GetSerializer(Network network)
{
if (network == null)
throw new ArgumentNullException(nameof(network));
ArgumentNullException.ThrowIfNull(network);
return GetSerializer(network.NetworkSet.CryptoCode);
}
public JsonSerializerSettings GetSerializer(BTCPayNetwork network)
{
if (network == null)
throw new ArgumentNullException(nameof(network));
ArgumentNullException.ThrowIfNull(network);
return GetSerializer(network.CryptoCode);
}
public JsonSerializerSettings GetSerializer(string cryptoCode)
{
if (cryptoCode == null)
throw new ArgumentNullException(nameof(cryptoCode));
ArgumentNullException.ThrowIfNull(cryptoCode);
_Serializers.TryGetValue(cryptoCode, out var serializer);
return serializer;
}

9
BTCPayServer/Services/DelayedTransactionBroadcaster.cs
View file

@ -33,8 +33,7 @@ namespace BTCPayServer.Services
Data.ApplicationDbContextFactory dbContextFactory,
Logs logs)
{
if (explorerClientProvider == null)
throw new ArgumentNullException(nameof(explorerClientProvider));
ArgumentNullException.ThrowIfNull(explorerClientProvider);
_networkProvider = networkProvider;
_explorerClientProvider = explorerClientProvider;
_dbContextFactory = dbContextFactory;
@ -43,10 +42,8 @@ namespace BTCPayServer.Services
public async Task Schedule(DateTimeOffset broadcastTime, Transaction transaction, BTCPayNetwork network)
{
if (transaction == null)
throw new ArgumentNullException(nameof(transaction));
if (network == null)
throw new ArgumentNullException(nameof(network));
ArgumentNullException.ThrowIfNull(transaction);
ArgumentNullException.ThrowIfNull(network);
using (var db = _dbContextFactory.CreateContext())
{
db.PlannedTransactions.Add(new PlannedTransaction()

6
BTCPayServer/Services/Fees/NBxplorerFeeProvider.cs
View file

@ -10,8 +10,7 @@ namespace BTCPayServer.Services.Fees
{
public NBXplorerFeeProviderFactory(ExplorerClientProvider explorerClients)
{
if (explorerClients == null)
throw new ArgumentNullException(nameof(explorerClients));
ArgumentNullException.ThrowIfNull(explorerClients);
_ExplorerClients = explorerClients;
}
@ -27,8 +26,7 @@ namespace BTCPayServer.Services.Fees
{
public NBXplorerFeeProvider(NBXplorerFeeProviderFactory parent, ExplorerClient explorerClient)
{
if (explorerClient == null)
throw new ArgumentNullException(nameof(explorerClient));
ArgumentNullException.ThrowIfNull(explorerClient);
_Factory = parent;
_ExplorerClient = explorerClient;
}

3
BTCPayServer/Services/Invoices/InvoiceRepository.cs
View file

@ -114,8 +114,7 @@ namespace BTCPayServer.Services.Invoices
public async Task<AppData[]> GetAppsTaggingStore(string storeId)
{
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
ArgumentNullException.ThrowIfNull(storeId);
using (var ctx = _applicationDbContextFactory.CreateContext())
{
return await ctx.Apps.Where(a => a.StoreDataId == storeId && a.TagAllInvoices).ToArrayAsync();

9
BTCPayServer/Services/Invoices/PaymentMethodDictionary.cs
View file

@ -32,8 +32,7 @@ namespace BTCPayServer.Services.Invoices
}
public bool TryGetValue(PaymentMethodId paymentMethodId, out PaymentMethod data)
{
if (paymentMethodId == null)
throw new ArgumentNullException(nameof(paymentMethodId));
ArgumentNullException.ThrowIfNull(paymentMethodId);
return _Inner.TryGetValue(paymentMethodId, out data);
}
@ -56,15 +55,13 @@ namespace BTCPayServer.Services.Invoices
public PaymentMethod TryGet(PaymentMethodId paymentMethodId)
{
if (paymentMethodId == null)
throw new ArgumentNullException(nameof(paymentMethodId));
ArgumentNullException.ThrowIfNull(paymentMethodId);
_Inner.TryGetValue(paymentMethodId, out var value);
return value;
}
public PaymentMethod TryGet(string network, PaymentType paymentType)
{
if (network == null)
throw new ArgumentNullException(nameof(network));
ArgumentNullException.ThrowIfNull(network);
var id = new PaymentMethodId(network, paymentType);
return TryGet(id);
}

3
BTCPayServer/Services/Labels/Label.cs
View file

@ -34,8 +34,7 @@ namespace BTCPayServer.Services.Labels
}
public static Label Parse(string str)
{
if (str == null)
throw new ArgumentNullException(nameof(str));
ArgumentNullException.ThrowIfNull(str);
if (str.StartsWith("{", StringComparison.InvariantCultureIgnoreCase))
{
var jObj = JObject.Parse(str);

3
BTCPayServer/Services/Labels/LabelFactory.cs
View file

@ -40,8 +40,7 @@ namespace BTCPayServer.Services.Labels
const string DefaultColor = "#000";
private ColoredLabel CreateLabel(LabelData uncoloredLabel, string color, HttpRequest request)
{
if (uncoloredLabel == null)
throw new ArgumentNullException(nameof(uncoloredLabel));
ArgumentNullException.ThrowIfNull(uncoloredLabel);
color = color ?? DefaultColor;
ColoredLabel coloredLabel = new ColoredLabel()

6
BTCPayServer/Services/LightningClientFactoryService.cs
View file

@ -15,10 +15,8 @@ namespace BTCPayServer.Services
public ILightningClient Create(LightningConnectionString lightningConnectionString, BTCPayNetwork network)
{
if (lightningConnectionString == null)
throw new ArgumentNullException(nameof(lightningConnectionString));
if (network == null)
throw new ArgumentNullException(nameof(network));
ArgumentNullException.ThrowIfNull(lightningConnectionString);
ArgumentNullException.ThrowIfNull(network);
return new Lightning.LightningClientFactory(network.NBitcoinNetwork)
{
HttpClient = _httpClientFactory.CreateClient($"{network.CryptoCode}: Lightning client")

3
BTCPayServer/Services/Mails/ServerEmailSender.cs
View file

@ -10,8 +10,7 @@ namespace BTCPayServer.Services.Mails
IBackgroundJobClient backgroundJobClient,
Logs logs) : base(backgroundJobClient, logs)
{
if (settingsRepository == null)
throw new ArgumentNullException(nameof(settingsRepository));
ArgumentNullException.ThrowIfNull(settingsRepository);
SettingsRepository = settingsRepository;
}

6
BTCPayServer/Services/Notifications/NotificationScopes.cs
View file

@ -12,8 +12,7 @@ namespace BTCPayServer.Services.Notifications
{
public StoreScope(string storeId)
{
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
ArgumentNullException.ThrowIfNull(storeId);
StoreId = storeId;
}
public string StoreId { get; }
@ -22,8 +21,7 @@ namespace BTCPayServer.Services.Notifications
{
public UserScope(string userId)
{
if (userId == null)
throw new ArgumentNullException(nameof(userId));
ArgumentNullException.ThrowIfNull(userId);
UserId = userId;
}
public string UserId { get; }

6
BTCPayServer/Services/Notifications/NotificationSender.cs
View file

@ -33,10 +33,8 @@ namespace BTCPayServer.Services.Notifications
public async Task SendNotification(NotificationScope scope, BaseNotification notification)
{
if (scope == null)
throw new ArgumentNullException(nameof(scope));
if (notification == null)
throw new ArgumentNullException(nameof(notification));
ArgumentNullException.ThrowIfNull(scope);
ArgumentNullException.ThrowIfNull(notification);
var users = await GetUsers(scope, notification.Identifier);
await using (var db = _contextFactory.CreateContext())
{

51
BTCPayServer/Services/Stores/StoreRepository.cs
View file

@ -35,8 +35,7 @@ namespace BTCPayServer.Services.Stores
public async Task<StoreData> FindStore(string storeId, string userId)
{
if (userId == null)
throw new ArgumentNullException(nameof(userId));
ArgumentNullException.ThrowIfNull(userId);
await using var ctx = _ContextFactory.CreateContext();
return (await ctx
.UserStore
@ -62,8 +61,7 @@ namespace BTCPayServer.Services.Stores
}
public async Task<StoreUser[]> GetStoreUsers(string storeId)
{
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
ArgumentNullException.ThrowIfNull(storeId);
using (var ctx = _ContextFactory.CreateContext())
{
return await ctx
@ -183,8 +181,7 @@ namespace BTCPayServer.Services.Stores
throw new ArgumentException("id should be empty", nameof(storeData.StoreName));
if (string.IsNullOrEmpty(storeData.StoreName))
throw new ArgumentException("name should not be empty", nameof(storeData.StoreName));
if (ownerId == null)
throw new ArgumentNullException(nameof(ownerId));
ArgumentNullException.ThrowIfNull(ownerId);
using (var ctx = _ContextFactory.CreateContext())
{
storeData.Id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(32));
@ -221,10 +218,8 @@ namespace BTCPayServer.Services.Stores
public async Task<WebhookDeliveryData> GetWebhookDelivery(string storeId, string webhookId, string deliveryId)
{
if (webhookId == null)
throw new ArgumentNullException(nameof(webhookId));
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
ArgumentNullException.ThrowIfNull(webhookId);
ArgumentNullException.ThrowIfNull(storeId);
using var ctx = _ContextFactory.CreateContext();
return await ctx.StoreWebhooks
.Where(d => d.StoreId == storeId && d.WebhookId == webhookId)
@ -251,10 +246,8 @@ namespace BTCPayServer.Services.Stores
public async Task<WebhookDeliveryData[]> GetWebhookDeliveries(string storeId, string webhookId, int? count)
{
if (webhookId == null)
throw new ArgumentNullException(nameof(webhookId));
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
ArgumentNullException.ThrowIfNull(webhookId);
ArgumentNullException.ThrowIfNull(storeId);
using var ctx = _ContextFactory.CreateContext();
IQueryable<WebhookDeliveryData> req = ctx.StoreWebhooks
.Where(s => s.StoreId == storeId && s.WebhookId == webhookId)
@ -268,10 +261,8 @@ namespace BTCPayServer.Services.Stores
public async Task<string> CreateWebhook(string storeId, WebhookBlob blob)
{
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
if (blob == null)
throw new ArgumentNullException(nameof(blob));
ArgumentNullException.ThrowIfNull(storeId);
ArgumentNullException.ThrowIfNull(blob);
using var ctx = _ContextFactory.CreateContext();
WebhookData data = new WebhookData();
data.Id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(16));
@ -289,10 +280,8 @@ namespace BTCPayServer.Services.Stores
public async Task<WebhookData> GetWebhook(string storeId, string webhookId)
{
if (webhookId == null)
throw new ArgumentNullException(nameof(webhookId));
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
ArgumentNullException.ThrowIfNull(webhookId);
ArgumentNullException.ThrowIfNull(storeId);
using var ctx = _ContextFactory.CreateContext();
return await ctx.StoreWebhooks
.Where(s => s.StoreId == storeId && s.WebhookId == webhookId)
@ -301,8 +290,7 @@ namespace BTCPayServer.Services.Stores
}
public async Task<WebhookData> GetWebhook(string webhookId)
{
if (webhookId == null)
throw new ArgumentNullException(nameof(webhookId));
ArgumentNullException.ThrowIfNull(webhookId);
using var ctx = _ContextFactory.CreateContext();
return await ctx.StoreWebhooks
.Where(s => s.WebhookId == webhookId)
@ -311,10 +299,8 @@ namespace BTCPayServer.Services.Stores
}
public async Task DeleteWebhook(string storeId, string webhookId)
{
if (webhookId == null)
throw new ArgumentNullException(nameof(webhookId));
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
ArgumentNullException.ThrowIfNull(webhookId);
ArgumentNullException.ThrowIfNull(storeId);
using var ctx = _ContextFactory.CreateContext();
var hook = await ctx.StoreWebhooks
.Where(s => s.StoreId == storeId && s.WebhookId == webhookId)
@ -328,12 +314,9 @@ namespace BTCPayServer.Services.Stores
public async Task UpdateWebhook(string storeId, string webhookId, WebhookBlob webhookBlob)
{
if (webhookId == null)
throw new ArgumentNullException(nameof(webhookId));
if (storeId == null)
throw new ArgumentNullException(nameof(storeId));
if (webhookBlob == null)
throw new ArgumentNullException(nameof(webhookBlob));
ArgumentNullException.ThrowIfNull(webhookId);
ArgumentNullException.ThrowIfNull(storeId);
ArgumentNullException.ThrowIfNull(webhookBlob);
using var ctx = _ContextFactory.CreateContext();
var hook = await ctx.StoreWebhooks
.Where(s => s.StoreId == storeId && s.WebhookId == webhookId)

15
BTCPayServer/Services/WalletRepository.cs
View file

@ -18,8 +18,7 @@ namespace BTCPayServer.Services
public async Task SetWalletInfo(WalletId walletId, WalletBlobInfo blob)
{
if (walletId == null)
throw new ArgumentNullException(nameof(walletId));
ArgumentNullException.ThrowIfNull(walletId);
using (var ctx = _ContextFactory.CreateContext())
{
var walletData = new WalletData() { Id = walletId.ToString() };
@ -40,8 +39,7 @@ namespace BTCPayServer.Services
public async Task<Dictionary<string, WalletTransactionInfo>> GetWalletTransactionsInfo(WalletId walletId, string[] transactionIds = null)
{
if (walletId == null)
throw new ArgumentNullException(nameof(walletId));
ArgumentNullException.ThrowIfNull(walletId);
using (var ctx = _ContextFactory.CreateContext())
{
return (await ctx.WalletTransactions
@ -55,8 +53,7 @@ namespace BTCPayServer.Services
public async Task<WalletBlobInfo> GetWalletInfo(WalletId walletId)
{
if (walletId == null)
throw new ArgumentNullException(nameof(walletId));
ArgumentNullException.ThrowIfNull(walletId);
using (var ctx = _ContextFactory.CreateContext())
{
var data = await ctx.Wallets
@ -69,10 +66,8 @@ namespace BTCPayServer.Services
public async Task SetWalletTransactionInfo(WalletId walletId, string transactionId, WalletTransactionInfo walletTransactionInfo)
{
if (walletId == null)
throw new ArgumentNullException(nameof(walletId));
if (transactionId == null)
throw new ArgumentNullException(nameof(transactionId));
ArgumentNullException.ThrowIfNull(walletId);
ArgumentNullException.ThrowIfNull(transactionId);
using (var ctx = _ContextFactory.CreateContext())
{
var walletData = new WalletTransactionData() { WalletDataId = walletId.ToString(), TransactionId = transactionId };

18
BTCPayServer/Services/Wallets/BTCPayWallet.cs
View file

@ -46,10 +46,8 @@ namespace BTCPayServer.Services.Wallets
public BTCPayWallet(ExplorerClient client, IMemoryCache memoryCache, BTCPayNetwork network,
ApplicationDbContextFactory dbContextFactory, Logs logs)
{
if (client == null)
throw new ArgumentNullException(nameof(client));
if (memoryCache == null)
throw new ArgumentNullException(nameof(memoryCache));
ArgumentNullException.ThrowIfNull(client);
ArgumentNullException.ThrowIfNull(memoryCache);
Logs = logs;
_Client = client;
_Network = network;
@ -73,8 +71,7 @@ namespace BTCPayServer.Services.Wallets
public async Task<KeyPathInformation> ReserveAddressAsync(DerivationStrategyBase derivationStrategy)
{
if (derivationStrategy == null)
throw new ArgumentNullException(nameof(derivationStrategy));
ArgumentNullException.ThrowIfNull(derivationStrategy);
var pathInfo = await _Client.GetUnusedAsync(derivationStrategy, DerivationFeature.Deposit, 0, true).ConfigureAwait(false);
// Might happen on some broken install
if (pathInfo == null)
@ -87,8 +84,7 @@ namespace BTCPayServer.Services.Wallets
public async Task<(BitcoinAddress, KeyPath)> GetChangeAddressAsync(DerivationStrategyBase derivationStrategy)
{
if (derivationStrategy == null)
throw new ArgumentNullException(nameof(derivationStrategy));
ArgumentNullException.ThrowIfNull(derivationStrategy);
var pathInfo = await _Client.GetUnusedAsync(derivationStrategy, DerivationFeature.Change, 0, false).ConfigureAwait(false);
// Might happen on some broken install
if (pathInfo == null)
@ -109,8 +105,7 @@ namespace BTCPayServer.Services.Wallets
public async Task<TransactionResult> GetTransactionAsync(uint256 txId, bool includeOffchain = false, CancellationToken cancellation = default(CancellationToken))
{
if (txId == null)
throw new ArgumentNullException(nameof(txId));
ArgumentNullException.ThrowIfNull(txId);
var tx = await _Client.GetTransactionAsync(txId, cancellation);
if (tx is null && includeOffchain)
{
@ -252,8 +247,7 @@ namespace BTCPayServer.Services.Wallets
public async Task<ReceivedCoin[]> GetUnspentCoins(DerivationStrategyBase derivationStrategy, CancellationToken cancellation = default(CancellationToken))
{
if (derivationStrategy == null)
throw new ArgumentNullException(nameof(derivationStrategy));
ArgumentNullException.ThrowIfNull(derivationStrategy);
return (await GetUTXOChanges(derivationStrategy, cancellation))
.GetUnspentUTXOs()
.Select(c => new ReceivedCoin()

9
BTCPayServer/Services/Wallets/BTCPayWalletProvider.cs
View file

@ -20,8 +20,7 @@ namespace BTCPayServer.Services.Wallets
BTCPayNetworkProvider networkProvider,
Logs logs)
{
if (client == null)
throw new ArgumentNullException(nameof(client));
ArgumentNullException.ThrowIfNull(client);
this.Logs = logs;
_Client = client;
_NetworkProvider = networkProvider;
@ -40,14 +39,12 @@ namespace BTCPayServer.Services.Wallets
public BTCPayWallet GetWallet(BTCPayNetworkBase network)
{
if (network == null)
throw new ArgumentNullException(nameof(network));
ArgumentNullException.ThrowIfNull(network);
return GetWallet(network.CryptoCode);
}
public BTCPayWallet GetWallet(string cryptoCode)
{
if (cryptoCode == null)
throw new ArgumentNullException(nameof(cryptoCode));
ArgumentNullException.ThrowIfNull(cryptoCode);
_Wallets.TryGetValue(cryptoCode.ToUpperInvariant(), out var result);
return result;
}

3
BTCPayServer/WalletId.cs
View file

@ -9,8 +9,7 @@ namespace BTCPayServer
static readonly Regex _WalletStoreRegex = new Regex("^S-([a-zA-Z0-9]{30,60})-([a-zA-Z]{2,5})$");
public static bool TryParse(string str, out WalletId walletId)
{
if (str == null)
throw new ArgumentNullException(nameof(str));
ArgumentNullException.ThrowIfNull(str);
walletId = null;
WalletId w = new WalletId();
var match = _WalletStoreRegex.Match(str);