- rename protected members in AbstractProvider

- rename `private static` member in `DefaultServiceProvider` - use `GetRequiredService` instead of `GetService` and throwing custom exception - use 1.0.4 version of `poolz.finance.csharp.contracts` package
The-Poolz · Jun 26, 2024 · b031026 · b031026
1 parent 9e12262
commit b031026
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/MetaDataAPI/DefaultServiceProvider.cs b/src/MetaDataAPI/DefaultServiceProvider.cs
@@ -8,7 +8,7 @@ namespace MetaDataAPI;
 
 public static class DefaultServiceProvider
 {
-    private static readonly Lazy<IServiceProvider> lazyInstance = new(() =>
+    private static readonly Lazy<IServiceProvider> LazyInstance = new(() =>
     {
         var serviceCollection = new ServiceCollection();
 
@@ -19,5 +19,5 @@ public static class DefaultServiceProvider
         return serviceCollection.BuildServiceProvider();
     });
 
-    public static IServiceProvider Instance => lazyInstance.Value;
+    public static IServiceProvider Instance => LazyInstance.Value;
 }
diff --git a/src/MetaDataAPI/LambdaFunction.cs b/src/MetaDataAPI/LambdaFunction.cs
@@ -22,7 +22,7 @@ public LambdaFunction()
     public LambdaFunction(IServiceProvider serviceProvider)
     {
         _serviceProvider = DefaultServiceProvider.Instance;
-        _chainManager = serviceProvider.GetService<IChainManager>() ?? throw new ArgumentException($"Service '{nameof(IChainManager)}' is required.");
+        _chainManager = serviceProvider.GetRequiredService<IChainManager>();
     }
 
     public LambdaResponse FunctionHandler(LambdaRequest request, ILambdaContext lambdaContext)

diff --git a/src/MetaDataAPI/MetaDataAPI.csproj b/src/MetaDataAPI/MetaDataAPI.csproj
@@ -21,6 +21,6 @@
 	<PackageReference Include="Net.Urlify" Version="1.0.1" />
 	<PackageReference Include="TLY.ShortUrl" Version="1.0.1" />
     <PackageReference Include="Utils.EnvironmentManager" Version="3.0.4" />
-    <PackageReference Include="poolz.finance.csharp.contracts" Version="1.0.3" />
+    <PackageReference Include="poolz.finance.csharp.contracts" Version="1.0.4" />
   </ItemGroup>
 </Project>
diff --git a/src/MetaDataAPI/Providers/AbstractProvider.cs b/src/MetaDataAPI/Providers/AbstractProvider.cs
@@ -18,8 +18,8 @@ namespace MetaDataAPI.Providers;
 
 public abstract class AbstractProvider : Urlify
 {
-    protected readonly IErc20Provider erc20Provider;
-    protected readonly ITlyContext tlyContext;
+    protected readonly IErc20Provider Erc20Provider;
+    protected readonly ITlyContext TlyContext;
 
     public IEnumerable<BasePoolInfo> FullData { get; }
     public BasePoolInfo PoolInfo { get; }
@@ -49,14 +49,14 @@ protected AbstractProvider(BasePoolInfo[] poolsInfo, ChainInfo chainInfo)
     protected AbstractProvider(BasePoolInfo[] poolsInfo, ChainInfo chainInfo, IServiceProvider serviceProvider)
         : base((string)Environments.NFT_HTML_ENDPOINT.Get())
     {
-        erc20Provider = serviceProvider.GetService<IErc20Provider>() ?? throw new ArgumentException($"Service '{nameof(IErc20Provider)}' is required.");
-        tlyContext = serviceProvider.GetService<ITlyContext>() ?? throw new ArgumentException($"Service '{nameof(ITlyContext)}' is required.");
+        Erc20Provider = serviceProvider.GetRequiredService<IErc20Provider>() ?? throw new ArgumentException($"Service '{nameof(IErc20Provider)}' is required.");
+        TlyContext = serviceProvider.GetRequiredService<ITlyContext>() ?? throw new ArgumentException($"Service '{nameof(ITlyContext)}' is required.");
 
         FullData = poolsInfo;
         PoolInfo = poolsInfo[0];
         ChainInfo = chainInfo;
 
-        Erc20Token = erc20Provider.GetErc20Token(chainInfo, PoolInfo.Token);
+        Erc20Token = Erc20Provider.GetErc20Token(chainInfo, PoolInfo.Token);
 
         PoolId = PoolInfo.PoolId;
         Name = PoolInfo.Name;
@@ -83,7 +83,7 @@ private string GetImage()
     {
         var url = new UrlifyProvider(this).BuildUrl();
         var description = $"ChainId: {ChainInfo.ChainId}, PoolId: {PoolId}, ProviderName: {Name}, VaultId: {VaultId}";
-        return tlyContext.GetShortUrlAsync(url, description)
+        return TlyContext.GetShortUrlAsync(url, description)
             .GetAwaiter()
             .GetResult()
             .ShortUrl;

diff --git a/src/MetaDataAPI/Providers/CollateralProvider.cs b/src/MetaDataAPI/Providers/CollateralProvider.cs
@@ -56,8 +56,8 @@ public CollateralProvider(BasePoolInfo poolInfo, ChainInfo chainInfo, IServicePr
     public CollateralProvider(BasePoolInfo[] poolsInfo, ChainInfo chainInfo, IServiceProvider serviceProvider)
         : base(poolsInfo, chainInfo, serviceProvider)
     {
-        MainCoin = erc20Provider.GetErc20Token(chainInfo, poolsInfo[0].Token);
-        Erc20Token = erc20Provider.GetErc20Token(chainInfo, poolsInfo[2].Token);
+        MainCoin = Erc20Provider.GetErc20Token(chainInfo, poolsInfo[0].Token);
+        Erc20Token = Erc20Provider.GetErc20Token(chainInfo, poolsInfo[2].Token);
         FinishTime = PoolInfo.Params[1];
         Rate = Web3.Convert.FromWei(PoolInfo.Params[2], 21);