aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 14:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the concept of unfiltered networks

Browse Source
This commit is contained in:
nicolas.dorier
2020-07-30 11:36:02 +09:00
parent 26112a1ed6
commit 1fb75c908b
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.cs
View File

@@ -22,7 +22,6 @@ namespace BTCPayServer
BTCPayNetworkProvider(BTCPayNetworkProvider unfiltered, string[] cryptoCodes) BTCPayNetworkProvider(BTCPayNetworkProvider unfiltered, string[] cryptoCodes)
{ {
UnfilteredNetworks = unfiltered.UnfilteredNetworks ?? unfiltered;
NetworkType = unfiltered.NetworkType; NetworkType = unfiltered.NetworkType;
_NBXplorerNetworkProvider = new NBXplorerNetworkProvider(unfiltered.NetworkType); _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(unfiltered.NetworkType);
_Networks = new Dictionary<string, BTCPayNetworkBase>(); _Networks = new Dictionary<string, BTCPayNetworkBase>();
@@ -36,12 +35,10 @@ namespace BTCPayServer
} }
} }
public BTCPayNetworkProvider UnfilteredNetworks { get; }
public NetworkType NetworkType { get; private set; } public NetworkType NetworkType { get; private set; }
public BTCPayNetworkProvider(NetworkType networkType) public BTCPayNetworkProvider(NetworkType networkType)
{ {
UnfilteredNetworks = this;
_NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType); _NBXplorerNetworkProvider = new NBXplorerNetworkProvider(networkType);
NetworkType = networkType; NetworkType = networkType;
InitBitcoin(); InitBitcoin();

1
BTCPayServer/Data/StoreDataExtensions.cs
View File

@@ -64,7 +64,6 @@ namespace BTCPayServer.Data
{ {
if (storeData == null) if (storeData == null)
throw new ArgumentNullException(nameof(storeData)); throw new ArgumentNullException(nameof(storeData));
networks = networks.UnfilteredNetworks;
#pragma warning disable CS0618 #pragma warning disable CS0618
bool btcReturned = false; bool btcReturned = false;

2
BTCPayServer/Services/BTCPayNetworkJsonSerializerSettings.cs
View File

@@ -26,7 +26,7 @@ namespace BTCPayServer.Services
{ {
public BTCPayNetworkJsonSerializerSettings(BTCPayNetworkProvider networkProvider, IEnumerable<IJsonConverterRegistration> jsonSerializers) public BTCPayNetworkJsonSerializerSettings(BTCPayNetworkProvider networkProvider, IEnumerable<IJsonConverterRegistration> jsonSerializers)
{ {
foreach (var network in networkProvider.UnfilteredNetworks.GetAll().OfType<BTCPayNetwork>()) foreach (var network in networkProvider.GetAll().OfType<BTCPayNetwork>())
{ {
var serializer = new JsonSerializerSettings(); var serializer = new JsonSerializerSettings();
foreach (var jsonSerializer in jsonSerializers) foreach (var jsonSerializer in jsonSerializers)

7
BTCPayServer/Services/Invoices/InvoiceEntity.cs
View File

@@ -554,7 +554,12 @@ namespace BTCPayServer.Services.Invoices
r.CryptoCode = paymentMethodId.CryptoCode; r.CryptoCode = paymentMethodId.CryptoCode;
r.PaymentType = paymentMethodId.PaymentType.ToString(); r.PaymentType = paymentMethodId.PaymentType.ToString();
r.ParentEntity = this; r.ParentEntity = this;
r.Network = Networks?.UnfilteredNetworks.GetNetwork<BTCPayNetworkBase>(r.CryptoCode); if (Networks != null)
{
r.Network = Networks.GetNetwork<BTCPayNetworkBase>(r.CryptoCode);
if (r.Network is null)
continue;
}
paymentMethods.Add(r); paymentMethods.Add(r);
} }
} }

2
BTCPayServer/Services/Invoices/InvoiceRepository.cs
View File

@@ -45,7 +45,7 @@ retry:
catch when (retryCount++ < 5) { goto retry; } catch when (retryCount++ < 5) { goto retry; }
_IndexerThread = new CustomThreadPool(1, "Invoice Indexer"); _IndexerThread = new CustomThreadPool(1, "Invoice Indexer");
_ContextFactory = contextFactory; _ContextFactory = contextFactory;
_Networks = networks.UnfilteredNetworks; _Networks = networks;
} }
public InvoiceEntity CreateNewInvoice() public InvoiceEntity CreateNewInvoice()