Removing unused usings, readonly fields where possible

BTCPayServer.Client/BTCPayServerClient.Authorization.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Client.Models;
 
 namespace BTCPayServer.Client
 {

BTCPayServer.Client/BTCPayServerClient.Health.cs

@@ -1,4 +1,3 @@
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;

BTCPayServer.Client/BTCPayServerClient.Lightning.Store.cs

@@ -4,7 +4,6 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Lightning;
 
 namespace BTCPayServer.Client
 {

BTCPayServer.Client/BTCPayServerClient.PullPayments.cs

@@ -1,7 +1,5 @@
-using System;
 using System.Collections.Generic;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;

BTCPayServer.Client/BTCPayServerClient.ServerInfo.cs

@@ -1,4 +1,3 @@
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;

BTCPayServer.Client/GreenFieldAPIException.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml.Linq;
 
 namespace BTCPayServer.Client
 {

BTCPayServer.Client/GreenFieldValidationException.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
 using System.Text;
 using BTCPayServer.Client.Models;
 

BTCPayServer.Client/JsonConverters/NodeUriJsonConverter.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Text;
-using BTCPayServer.Client.Models;
 using BTCPayServer.Lightning;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;

BTCPayServer.Client/JsonConverters/PermissionJsonConverter.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Reflection;
-using System.Text;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
 

BTCPayServer.Client/JsonConverters/TimeSpanJsonConverter.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
 

BTCPayServer.Client/Models/ApprovePayoutRequest.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace BTCPayServer.Client.Models
 {
     public class ApprovePayoutRequest

BTCPayServer.Client/Models/ConnectToNodeRequest.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.Lightning;
 using Newtonsoft.Json;

BTCPayServer.Client/Models/CreateLightningInvoiceRequest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Security.Cryptography;
 using BTCPayServer.Lightning;
 using BTCPayServer.Lightning.JsonConverters;
 using Newtonsoft.Json;

BTCPayServer.Client/Models/CreatePayoutRequest.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
 

BTCPayServer.Client/Models/CreatePullPaymentRequest.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;

BTCPayServer.Client/Models/GreenfieldAPIError.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace BTCPayServer.Client.Models
 {

BTCPayServer.Client/Models/GreenfieldValidationError.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace BTCPayServer.Client.Models
 {

BTCPayServer.Client/Models/LightningNodeInformationData.cs

@@ -1,8 +1,5 @@
-using System.Collections.Generic;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.Lightning;
-using NBitcoin;
-using NBitcoin.JsonConverters;
 using Newtonsoft.Json;
 
 namespace BTCPayServer.Client.Models

BTCPayServer.Client/Models/PayoutData.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

BTCPayServer.Client/Models/PullPaymentBaseData.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using BTCPayServer.Client.JsonConverters;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;

BTCPayServer.Client/Models/StoreBaseData.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using BTCPayServer.Client.JsonConverters;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcoin.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcore.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Dogecoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Feathercoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Groestlcoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 
 namespace BTCPayServer

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Litecoin.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Monacoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Polis.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Ufo.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Viacoin.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBXplorer;
 
@@ -10,7 +8,7 @@ namespace BTCPayServer
 {
     public partial class BTCPayNetworkProvider
     {
-        Dictionary<string, BTCPayNetworkBase> _Networks = new Dictionary<string, BTCPayNetworkBase>();
+        readonly Dictionary<string, BTCPayNetworkBase> _Networks = new Dictionary<string, BTCPayNetworkBase>();
 
 
         private readonly NBXplorerNetworkProvider _NBXplorerNetworkProvider;

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.Liquid.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using NBitcoin;
 using NBitcoin.Altcoins;
 using NBitcoin.Altcoins.Elements;

BTCPayServer.Common/BTCPayNetwork.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NBitcoin;
 using NBXplorer;
 using NBXplorer.Models;
-using Newtonsoft.Json;
 
 namespace BTCPayServer
 {
@@ -33,7 +31,7 @@ namespace BTCPayServer
             }
         }
 
-        static Dictionary<NetworkType, BTCPayDefaultSettings> _Settings;
+        static readonly Dictionary<NetworkType, BTCPayDefaultSettings> _Settings;
 
         public static BTCPayDefaultSettings GetDefaultSettings(NetworkType chainType)
         {

BTCPayServer.Common/CustomThreadPool.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -9,12 +8,12 @@ namespace BTCPayServer
 {
     public class CustomThreadPool : IDisposable
     {
-        CancellationTokenSource _Cancel = new CancellationTokenSource();
-        TaskCompletionSource<bool> _Exited;
+        readonly CancellationTokenSource _Cancel = new CancellationTokenSource();
+        readonly TaskCompletionSource<bool> _Exited;
         int _ExitedCount = 0;
-        Thread[] _Threads;
+        readonly Thread[] _Threads;
         Exception _UnhandledException;
-        BlockingCollection<(Action, TaskCompletionSource<object>)> _Actions = new BlockingCollection<(Action, TaskCompletionSource<object>)>(new ConcurrentQueue<(Action, TaskCompletionSource<object>)>());
+        readonly BlockingCollection<(Action, TaskCompletionSource<object>)> _Actions = new BlockingCollection<(Action, TaskCompletionSource<object>)>(new ConcurrentQueue<(Action, TaskCompletionSource<object>)>());
 
         public CustomThreadPool(int threadCount, string threadName)
         {

BTCPayServer.Common/Extensions.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/Logging/ConsoleLogger.cs

@@ -13,7 +13,7 @@ namespace BTCPayServer.Logging
 {
     public class CustomConsoleLogProvider : ILoggerProvider
     {
-        ConsoleLoggerProcessor _Processor;
+        readonly ConsoleLoggerProcessor _Processor;
         public CustomConsoleLogProvider(ConsoleLoggerProcessor processor)
         {
             _Processor = processor;

BTCPayServer.Common/Logging/Logs.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
@@ -43,7 +40,7 @@ namespace BTCPayServer.Logging
 
     public class FuncLoggerFactory : ILoggerFactory
     {
-        private Func<string, ILogger> createLogger;
+        private readonly Func<string, ILogger> createLogger;
         public FuncLoggerFactory(Func<string, ILogger> createLogger)
         {
             this.createLogger = createLogger;

BTCPayServer.Common/Shims.cs

@@ -2,11 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Newtonsoft.Json;
 
 
 namespace Microsoft.Extensions.Logging.Console.Internal

BTCPayServer.Common/SynchronizationContextRemover.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace BTCPayServer
 {

BTCPayServer.Common/ZipUtils.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Text;

BTCPayServer.Data/Data/APIKeyData.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/AddressInvoiceData.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/AppData.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 

BTCPayServer.Data/Data/ApplicationDbContextFactory.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -19,8 +15,8 @@ namespace BTCPayServer.Data
     }
     public class ApplicationDbContextFactory
     {
-        string _ConnectionString;
-        DatabaseType _Type;
+        readonly string _ConnectionString;
+        readonly DatabaseType _Type;
         public ApplicationDbContextFactory(DatabaseType type, string connectionString)
         {
             _ConnectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString));

BTCPayServer.Data/Data/ApplicationUser.cs

@@ -1,8 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Data;
 using Microsoft.AspNetCore.Identity;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/HistoricalAddressInvoiceData.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/InvoiceData.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/InvoiceEventData.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/NotificationData.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/PairedSINData.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/PairingCodeData.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/PaymentData.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/PaymentRequestData.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using BTCPayServer.Client.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/PayoutData.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Text;
 using Microsoft.EntityFrameworkCore;
 using NBitcoin;
 

BTCPayServer.Data/Data/PendingInvoiceData.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/PullPaymentData.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
 using Microsoft.EntityFrameworkCore;
 using NBitcoin;
 

BTCPayServer.Data/Data/RefundData.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Text;
-using System.Xml.Linq;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/SettingData.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace BTCPayServer.Data
 {
     public class SettingData

BTCPayServer.Data/Data/U2FDevice.cs

@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/UserStore.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data

BTCPayServer.Data/Data/WalletData.cs

@@ -1,9 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Emit;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Newtonsoft.Json;
 
 namespace BTCPayServer.Data
 {

BTCPayServer.Data/Data/WalletTransactionData.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 

BTCPayServer.Data/Migrations/20170913143004_Init.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20170926073744_Settings.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20170926084408_RequiresEmailConfirmation.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20171006013443_AddressMapping.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20171010082424_Tokens.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20171012020112_PendingInvoices.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20171023101754_StoreBlob.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20171024163354_RenewUsedAddresses.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20171105235734_PaymentAccounted.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20171221054550_AltcoinSupport.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20180106095215_DerivationStrategies.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20180109021122_defaultcrypto.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20180114123253_events.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20180402095640_appdata.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20180429083930_legacyapikey.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20190121133309_AddPaymentRequests.cs

@@ -1,4 +1,3 @@
-using System;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20190425081749_AddU2fDevices.cs

@@ -1,4 +1,3 @@
-using System;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/Migrations/20190802142637_WalletData.cs

@@ -1,4 +1,3 @@
-using System;
 using BTCPayServer.Data;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;

BTCPayServer.Data/MigrationsExtensions.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace BTCPayServer.Migrations

BTCPayServer.Rating/CurrencyNameTable.cs

@@ -27,7 +27,7 @@ namespace BTCPayServer.Services.Rates
             _Currencies = LoadCurrency().ToDictionary(k => k.Code);
         }
 
-        static Dictionary<string, IFormatProvider> _CurrencyProviders = new Dictionary<string, IFormatProvider>();
+        static readonly Dictionary<string, IFormatProvider> _CurrencyProviders = new Dictionary<string, IFormatProvider>();
 
         public string FormatCurrency(string price, string currency)
         {
@@ -130,7 +130,7 @@ namespace BTCPayServer.Services.Rates
                 return value.ToString("C", provider) + $" ({currency})";
         }
 
-        Dictionary<string, CurrencyData> _Currencies;
+        readonly Dictionary<string, CurrencyData> _Currencies;
 
         static CurrencyData[] LoadCurrency()
         {

BTCPayServer.Rating/ExchangeRates.cs

@@ -8,7 +8,7 @@ namespace BTCPayServer.Rating
 {
     public class ExchangeRates : IEnumerable<ExchangeRate>
     {
-        Dictionary<string, ExchangeRate> _AllRates = new Dictionary<string, ExchangeRate>();
+        readonly Dictionary<string, ExchangeRate> _AllRates = new Dictionary<string, ExchangeRate>();
         public ExchangeRates()
         {
 
@@ -28,7 +28,8 @@ namespace BTCPayServer.Rating
                 Add(rate);
             }
         }
-        List<ExchangeRate> _Rates = new List<ExchangeRate>();
+
+        readonly List<ExchangeRate> _Rates = new List<ExchangeRate>();
         public MultiValueDictionary<string, ExchangeRate> ByExchange
         {
             get;

BTCPayServer.Rating/MultiValueDictionary.cs

@@ -34,7 +34,7 @@ namespace BTCPayServer
         /// <summary>
         /// The private dictionary that this class effectively wraps around
         /// </summary>
-        private Dictionary<TKey, InnerCollectionView> dictionary;
+        private readonly Dictionary<TKey, InnerCollectionView> dictionary;
 
         /// <summary>
         /// The function to construct a new <see cref="ICollection{TValue}"/>
@@ -900,8 +900,8 @@ namespace BTCPayServer
         private class Enumerator :
             IEnumerator<KeyValuePair<TKey, IReadOnlyCollection<TValue>>>
         {
-            private MultiValueDictionary<TKey, TValue> multiValueDictionary;
-            private int version;
+            private readonly MultiValueDictionary<TKey, TValue> multiValueDictionary;
+            private readonly int version;
             private KeyValuePair<TKey, IReadOnlyCollection<TValue>> current;
             private Dictionary<TKey, InnerCollectionView>.Enumerator enumerator;
             private enum EnumerationState { BeforeFirst, During, AfterLast };
@@ -1002,8 +1002,8 @@ namespace BTCPayServer
             ICollection<TValue>,
             IReadOnlyCollection<TValue>
         {
-            private TKey key;
-            private ICollection<TValue> collection;
+            private readonly TKey key;
+            private readonly ICollection<TValue> collection;
 
             #region Private Concrete API
             /*======================================================================

BTCPayServer.Rating/Providers/BackgroundFetcherRateProvider.cs

@@ -80,7 +80,7 @@ namespace BTCPayServer.Services.Rates
             }
         }
 
-        IRateProvider _Inner;
+        readonly IRateProvider _Inner;
         public IRateProvider Inner => _Inner;
 
         public BackgroundFetcherRateProvider(IRateProvider inner)

BTCPayServer.Rating/Providers/BitbankRateProvider.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;

BTCPayServer.Rating/Providers/BitflyerRateProvider.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

BTCPayServer.Rating/Providers/BitpayRateProvider.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;

BTCPayServer.Rating/Providers/ByllsRateProvider.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

BTCPayServer.Rating/Providers/ExchangeSharpRateProvider.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,7 +12,7 @@ namespace BTCPayServer.Services.Rates
 {
     public class ExchangeSharpRateProvider<T> : IRateProvider where T : ExchangeAPI, new()
     {
-        HttpClient _httpClient;
+        readonly HttpClient _httpClient;
         public ExchangeSharpRateProvider(HttpClient httpClient, bool reverseCurrencyPair = false)
         {
             if (httpClient == null)
@@ -48,7 +46,7 @@ namespace BTCPayServer.Services.Rates
         }
 
         // ExchangeSymbolToGlobalSymbol throws exception which would kill perf
-        ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>();
+        readonly ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>();
         private async Task<PairRate> CreateExchangeRate(T exchangeAPI, KeyValuePair<string, ExchangeTicker> ticker)
         {
             if (notFoundSymbols.TryGetValue(ticker.Key, out _))

BTCPayServer.Rating/Providers/FallbackRateProvider.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
@@ -9,7 +8,7 @@ namespace BTCPayServer.Services.Rates
 {
     public class FallbackRateProvider : IRateProvider
     {
-        IRateProvider[] _Providers;
+        readonly IRateProvider[] _Providers;
         public FallbackRateProvider(IRateProvider[] providers)
         {
             if (providers == null)

BTCPayServer.Rating/Providers/HttpClientRequestMaker.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using ExchangeSharp;
-using Microsoft.Extensions.Logging;
 
 namespace BTCPayServer.Services.Rates
 {
@@ -132,7 +129,7 @@ namespace BTCPayServer.Services.Rates
                 }
             }
             public Dictionary<string, IReadOnlyList<string>> Headers { get; }
-            static IReadOnlyList<string> Empty = new List<string>().AsReadOnly();
+            static readonly IReadOnlyList<string> Empty = new List<string>().AsReadOnly();
             public IReadOnlyList<string> GetHeader(string name)
             {
                 Headers.TryGetValue(name, out var list);

BTCPayServer.Rating/Providers/IRateProvider.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;

BTCPayServer.Rating/Providers/KrakenExchangeRateProvider.cs

@@ -20,7 +20,8 @@ namespace BTCPayServer.Services.Rates
         {
             _Helper = new ExchangeKrakenAPI();
         }
-        ExchangeKrakenAPI _Helper;
+
+        readonly ExchangeKrakenAPI _Helper;
         public HttpClient HttpClient
         {
             get
@@ -34,10 +35,10 @@ namespace BTCPayServer.Services.Rates
         }
 
         HttpClient _LocalClient;
-        static HttpClient _Client = new HttpClient();
+        static readonly HttpClient _Client = new HttpClient();
 
         // ExchangeSymbolToGlobalSymbol throws exception which would kill perf
-        ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>(new Dictionary<string, string>()
+        readonly ConcurrentDictionary<string, string> notFoundSymbols = new ConcurrentDictionary<string, string>(new Dictionary<string, string>()
         {
             {"ADAXBT","ADAXBT"},
             { "BSVUSD","BSVUSD"},
@@ -70,9 +71,7 @@ namespace BTCPayServer.Services.Rates
         });
         string[] _Symbols = Array.Empty<string>();
         DateTimeOffset? _LastSymbolUpdate = null;
-
-
-        Dictionary<string, string> _TickerMapping = new Dictionary<string, string>()
+        readonly Dictionary<string, string> _TickerMapping = new Dictionary<string, string>()
         {
             { "XXDG", "DOGE" },
             { "XXBT", "BTC" },

BTCPayServer.Rating/Providers/NullRateProvider.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;

BTCPayServer.Rating/Providers/PolisRateProvider.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;

BTCPayServer.Rating/RateRules.cs

@@ -95,8 +95,8 @@ namespace BTCPayServer.Rating
             }
         }
 
-        SyntaxNode root;
-        RuleList ruleList;
+        readonly SyntaxNode root;
+        readonly RuleList ruleList;
 
         decimal _Spread;
         private const string ImplicitSatsRule = "SATS_X = SATS_BTC * BTC_X;\nSATS_BTC = 0.00000001;\n";
@@ -401,8 +401,8 @@ namespace BTCPayServer.Rating
         }
         class FlattenExpressionRewriter : CSharpSyntaxRewriter
         {
-            RateRules parent;
-            CurrencyPair pair;
+            readonly RateRules parent;
+            readonly CurrencyPair pair;
             int nested = 0;
             public FlattenExpressionRewriter(RateRules parent, CurrencyPair pair)
             {
@@ -491,8 +491,8 @@ namespace BTCPayServer.Rating
                 };
             }
         }
-        private SyntaxNode expression;
-        FlattenExpressionRewriter flatten;
+        private readonly SyntaxNode expression;
+        readonly FlattenExpressionRewriter flatten;
 
         public static RateRule CreateFromExpression(string expression, CurrencyPair currencyPair)
         {

BTCPayServer.Rating/Services/RateFetcher.cs

@@ -1,14 +1,9 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
-using ExchangeSharp;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Options;
 using static BTCPayServer.Services.Rates.RateProviderFactory;
 
 namespace BTCPayServer.Services.Rates