From bd5dd429337f6f24a06cd5e27c74417c5a7b0a01 Mon Sep 17 00:00:00 2001 From: Ivan Yaremenchuk Date: Sat, 27 Aug 2022 16:51:21 -0500 Subject: [PATCH] Change GetNetworks method to Networks property (and same for GetProviders) --- NftFaucetRadzen/Pages/NetworkPage.razor.cs | 2 +- NftFaucetRadzen/Pages/ProviderPage.razor.cs | 2 +- .../Plugins/NetworkPlugins/Arbitrum/ArbitrumNetworkPlugin.cs | 4 +--- .../NetworkPlugins/Avalanche/AvalancheNetworkPlugin.cs | 4 +--- .../NetworkPlugins/BinanceSmartChain/BscNetworkPlugin.cs | 4 +--- .../Plugins/NetworkPlugins/Ethereum/EthereumNetworkPlugin.cs | 4 +--- NftFaucetRadzen/Plugins/NetworkPlugins/INetworkPlugin.cs | 2 +- .../Plugins/NetworkPlugins/Moonbeam/MoonbeamNetworkPlugin.cs | 4 +--- .../Plugins/NetworkPlugins/Optimism/OptimismNetworkPlugin.cs | 4 +--- .../Plugins/NetworkPlugins/Polygon/PolygonNetworkPlugin.cs | 4 +--- .../Plugins/NetworkPlugins/Solana/SolanaNetworkPlugin.cs | 4 +--- .../GeneratedKeys/GeneratedKeysProviderPlugin.cs | 4 +--- NftFaucetRadzen/Plugins/ProviderPlugins/IProviderPlugin.cs | 2 +- .../ProviderPlugins/Metamask/MetamaskProviderPlugin.cs | 4 +--- NftFaucetRadzen/Shared/NavMenu.razor.cs | 4 ++-- 15 files changed, 16 insertions(+), 36 deletions(-) diff --git a/NftFaucetRadzen/Pages/NetworkPage.razor.cs b/NftFaucetRadzen/Pages/NetworkPage.razor.cs index 1cdaf52..4d6371f 100644 --- a/NftFaucetRadzen/Pages/NetworkPage.razor.cs +++ b/NftFaucetRadzen/Pages/NetworkPage.razor.cs @@ -28,7 +28,7 @@ public partial class NetworkPage : BasicComponent { PluginLoader?.EnsurePluginsLoaded(); var networkPlugins = PluginLoader?.NetworkPlugins; - var networks = networkPlugins?.SelectMany(x => x?.GetNetworks()).Where(x => x != null).OrderBy(x => x.ChainId ?? ulong.MaxValue).ToArray() ?? Array.Empty(); + var networks = networkPlugins?.SelectMany(x => x?.Networks).Where(x => x != null).OrderBy(x => x.ChainId ?? ulong.MaxValue).ToArray() ?? Array.Empty(); NetworksLookup = networks.ToLookup(x => x.Type, MapCardListItem); } diff --git a/NftFaucetRadzen/Pages/ProviderPage.razor.cs b/NftFaucetRadzen/Pages/ProviderPage.razor.cs index 40d45e1..565dfd4 100644 --- a/NftFaucetRadzen/Pages/ProviderPage.razor.cs +++ b/NftFaucetRadzen/Pages/ProviderPage.razor.cs @@ -26,7 +26,7 @@ public partial class ProviderPage : BasicComponent protected override void OnInitialized() { - Providers = PluginLoader?.ProviderPlugins?.SelectMany(x => x.GetProviders()).Where(x => x != null).ToArray() ?? Array.Empty(); + Providers = PluginLoader?.ProviderPlugins?.SelectMany(x => x.Providers).Where(x => x != null).ToArray() ?? Array.Empty(); RefreshData(); } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/Arbitrum/ArbitrumNetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/Arbitrum/ArbitrumNetworkPlugin.cs index a1892c0..3ce981d 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/Arbitrum/ArbitrumNetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/Arbitrum/ArbitrumNetworkPlugin.cs @@ -4,12 +4,10 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins.Arbitrum; public class ArbitrumNetworkPlugin : INetworkPlugin { - private IReadOnlyCollection Networks { get; } = new INetwork[] + public IReadOnlyCollection Networks { get; } = new INetwork[] { new ArbitrumOneNetwork(), new ArbitrumNovaNetwork(), new ArbitrumRinkebyNetwork(), }; - - public IReadOnlyCollection GetNetworks() => Networks; } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/Avalanche/AvalancheNetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/Avalanche/AvalancheNetworkPlugin.cs index ca3d794..2775274 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/Avalanche/AvalancheNetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/Avalanche/AvalancheNetworkPlugin.cs @@ -4,11 +4,9 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins.Avalanche; public class AvalancheNetworkPlugin : INetworkPlugin { - private IReadOnlyCollection Networks { get; } = new INetwork[] + public IReadOnlyCollection Networks { get; } = new INetwork[] { new AvalancheMainnetNetwork(), new AvalancheFujiNetwork(), }; - - public IReadOnlyCollection GetNetworks() => Networks; } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/BinanceSmartChain/BscNetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/BinanceSmartChain/BscNetworkPlugin.cs index 8fe5f68..2286d8d 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/BinanceSmartChain/BscNetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/BinanceSmartChain/BscNetworkPlugin.cs @@ -4,11 +4,9 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins.BinanceSmartChain; public class BscNetworkPlugin : INetworkPlugin { - private IReadOnlyCollection Networks { get; } = new INetwork[] + public IReadOnlyCollection Networks { get; } = new INetwork[] { new BscMainnetNetwork(), new BscTestnetNetwork(), }; - - public IReadOnlyCollection GetNetworks() => Networks; } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/Ethereum/EthereumNetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/Ethereum/EthereumNetworkPlugin.cs index 466e256..c6b4e2b 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/Ethereum/EthereumNetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/Ethereum/EthereumNetworkPlugin.cs @@ -4,7 +4,7 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins.Ethereum; public class EthereumNetworkPlugin : INetworkPlugin { - private IReadOnlyCollection Networks { get; } = new INetwork[] + public IReadOnlyCollection Networks { get; } = new INetwork[] { new EthereumMainnetNetwork(), new RopstenNetwork(), @@ -15,6 +15,4 @@ public class EthereumNetworkPlugin : INetworkPlugin new SepoliaNetwork(), new CustomNetwork(), }; - - public IReadOnlyCollection GetNetworks() => Networks; } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/INetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/INetworkPlugin.cs index 189510f..e15ae94 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/INetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/INetworkPlugin.cs @@ -2,5 +2,5 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins; public interface INetworkPlugin { - public IReadOnlyCollection GetNetworks(); + public IReadOnlyCollection Networks { get; } } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/Moonbeam/MoonbeamNetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/Moonbeam/MoonbeamNetworkPlugin.cs index ad95be7..f1d4e18 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/Moonbeam/MoonbeamNetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/Moonbeam/MoonbeamNetworkPlugin.cs @@ -4,12 +4,10 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins.Moonbeam; public class MoonbeamNetworkPlugin : INetworkPlugin { - private IReadOnlyCollection Networks { get; } = new INetwork[] + public IReadOnlyCollection Networks { get; } = new INetwork[] { new MoonbeamNetwork(), new MoonriverNetwork(), new MoonbaseAlphaNetwork(), }; - - public IReadOnlyCollection GetNetworks() => Networks; } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/Optimism/OptimismNetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/Optimism/OptimismNetworkPlugin.cs index c0eb907..29b9ca1 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/Optimism/OptimismNetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/Optimism/OptimismNetworkPlugin.cs @@ -4,12 +4,10 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins.Optimism; public class OptimismNetworkPlugin : INetworkPlugin { - private IReadOnlyCollection Networks { get; } = new INetwork[] + public IReadOnlyCollection Networks { get; } = new INetwork[] { new OptimismMainnetNetwork(), new OptimismKovanNetwork(), new OptimismGoerliNetwork(), }; - - public IReadOnlyCollection GetNetworks() => Networks; } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/Polygon/PolygonNetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/Polygon/PolygonNetworkPlugin.cs index c9e0d58..c77ed27 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/Polygon/PolygonNetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/Polygon/PolygonNetworkPlugin.cs @@ -4,11 +4,9 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins.Polygon; public class PolygonNetworkPlugin : INetworkPlugin { - private IReadOnlyCollection Networks { get; } = new INetwork[] + public IReadOnlyCollection Networks { get; } = new INetwork[] { new PolygonMainnetNetwork(), new PolygonMumbaiNetwork(), }; - - public IReadOnlyCollection GetNetworks() => Networks; } diff --git a/NftFaucetRadzen/Plugins/NetworkPlugins/Solana/SolanaNetworkPlugin.cs b/NftFaucetRadzen/Plugins/NetworkPlugins/Solana/SolanaNetworkPlugin.cs index 78dc7f3..cbf69b2 100644 --- a/NftFaucetRadzen/Plugins/NetworkPlugins/Solana/SolanaNetworkPlugin.cs +++ b/NftFaucetRadzen/Plugins/NetworkPlugins/Solana/SolanaNetworkPlugin.cs @@ -4,12 +4,10 @@ namespace NftFaucetRadzen.Plugins.NetworkPlugins.Solana; public class SolanaNetworkPlugin : INetworkPlugin { - private IReadOnlyCollection Networks { get; } = new INetwork[] + public IReadOnlyCollection Networks { get; } = new INetwork[] { new SolanaMainnetNetwork(), new SolanaDevnetNetwork(), new SolanaTestnetNetwork(), }; - - public IReadOnlyCollection GetNetworks() => Networks; } diff --git a/NftFaucetRadzen/Plugins/ProviderPlugins/GeneratedKeys/GeneratedKeysProviderPlugin.cs b/NftFaucetRadzen/Plugins/ProviderPlugins/GeneratedKeys/GeneratedKeysProviderPlugin.cs index 068063e..36bc350 100644 --- a/NftFaucetRadzen/Plugins/ProviderPlugins/GeneratedKeys/GeneratedKeysProviderPlugin.cs +++ b/NftFaucetRadzen/Plugins/ProviderPlugins/GeneratedKeys/GeneratedKeysProviderPlugin.cs @@ -4,10 +4,8 @@ namespace NftFaucetRadzen.Plugins.ProviderPlugins.GeneratedKeys; public class GeneratedKeysProviderPlugin : IProviderPlugin { - private IReadOnlyCollection Providers { get; } = new IProvider[] + public IReadOnlyCollection Providers { get; } = new IProvider[] { new GeneratedKeysProvider(), }; - - public IReadOnlyCollection GetProviders() => Providers; } diff --git a/NftFaucetRadzen/Plugins/ProviderPlugins/IProviderPlugin.cs b/NftFaucetRadzen/Plugins/ProviderPlugins/IProviderPlugin.cs index de4bba1..26e3128 100644 --- a/NftFaucetRadzen/Plugins/ProviderPlugins/IProviderPlugin.cs +++ b/NftFaucetRadzen/Plugins/ProviderPlugins/IProviderPlugin.cs @@ -2,5 +2,5 @@ namespace NftFaucetRadzen.Plugins.ProviderPlugins; public interface IProviderPlugin { - public IReadOnlyCollection GetProviders(); + public IReadOnlyCollection Providers { get; } } diff --git a/NftFaucetRadzen/Plugins/ProviderPlugins/Metamask/MetamaskProviderPlugin.cs b/NftFaucetRadzen/Plugins/ProviderPlugins/Metamask/MetamaskProviderPlugin.cs index 793b977..0108824 100644 --- a/NftFaucetRadzen/Plugins/ProviderPlugins/Metamask/MetamaskProviderPlugin.cs +++ b/NftFaucetRadzen/Plugins/ProviderPlugins/Metamask/MetamaskProviderPlugin.cs @@ -4,10 +4,8 @@ namespace NftFaucetRadzen.Plugins.ProviderPlugins.Metamask; public class MetamaskProviderPlugin : IProviderPlugin { - private IReadOnlyCollection Providers { get; } = new IProvider[] + public IReadOnlyCollection Providers { get; } = new IProvider[] { new MetamaskProvider(), }; - - public IReadOnlyCollection GetProviders() => Providers; } diff --git a/NftFaucetRadzen/Shared/NavMenu.razor.cs b/NftFaucetRadzen/Shared/NavMenu.razor.cs index 7d42e62..eb9d18f 100644 --- a/NftFaucetRadzen/Shared/NavMenu.razor.cs +++ b/NftFaucetRadzen/Shared/NavMenu.razor.cs @@ -7,9 +7,9 @@ namespace NftFaucetRadzen.Shared; public partial class NavMenu : BasicComponent { protected Guid? SelectedNetworkId => AppState?.Storage?.SelectedNetworks?.FirstOrDefault(); - protected string SelectedNetworkName => PluginLoader?.NetworkPlugins?.SelectMany(x => x.GetNetworks()).FirstOrDefault(x => x.Id == SelectedNetworkId)?.ShortName; + protected string SelectedNetworkName => PluginLoader?.NetworkPlugins?.SelectMany(x => x?.Networks).FirstOrDefault(x => x?.Id == SelectedNetworkId)?.ShortName; protected Guid? SelectedProviderId => AppState?.Storage?.SelectedProviders?.FirstOrDefault(); - protected string SelectedProviderName => PluginLoader?.ProviderPlugins?.SelectMany(x => x.GetProviders()).FirstOrDefault(x => x.Id == SelectedProviderId)?.ShortName; + protected string SelectedProviderName => PluginLoader?.ProviderPlugins?.SelectMany(x => x?.Providers).FirstOrDefault(x => x?.Id == SelectedProviderId)?.ShortName; private bool CollapseNavMenu { get; set; } = true;