revert options

gear-tech · Nov 27, 2024 · c003c76 · c003c76
1 parent 5a66889
commit c003c76
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props
@@ -7,7 +7,6 @@
     <PackageVersion Include="Ensure.That" Version="10.1.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
     <PackageVersion Include="PolySharp" Version="1.14.1" />
     <PackageVersion Include="Substrate.NET.API" Version="0.9.23" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />

diff --git a/net/src/Sails.Net/Sails.Net.csproj b/net/src/Sails.Net/Sails.Net.csproj
@@ -54,7 +54,6 @@
   <!-- Sails.Remoting.Abstractions -->
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
-    <PackageReference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/net/src/Sails.Remoting/Core/NodeClientProvider.cs b/net/src/Sails.Remoting/Core/NodeClientProvider.cs
@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using EnsureThat;
-using Microsoft.Extensions.Options;
 using Sails.Remoting.Options;
 using Substrate.Gear.Api.Generated;
 using Substrate.NetApi.Model.Extrinsics;
@@ -11,12 +10,12 @@ namespace Sails.Remoting.Core;
 
 internal sealed class NodeClientProvider : IDisposable, INodeClientProvider
 {
-    public NodeClientProvider(IOptions<NodeClientOptions> options)
+    public NodeClientProvider(NodeClientOptions options)
     {
         EnsureArg.IsNotNull(options, nameof(options));
-        EnsureArg.IsNotNull(options.Value.GearNodeUri, nameof(options.Value.GearNodeUri));
+        EnsureArg.IsNotNull(options.GearNodeUri, nameof(options.GearNodeUri));
 
-        this.nodeClient = new SubstrateClientExt(options.Value.GearNodeUri, ChargeTransactionPayment.Default());
+        this.nodeClient = new SubstrateClientExt(options.GearNodeUri, ChargeTransactionPayment.Default());
     }
 
     private readonly SubstrateClientExt nodeClient;

diff --git a/net/src/Sails.Remoting/DependencyInjection/ServiceCollectionExtensions.cs b/net/src/Sails.Remoting/DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using EnsureThat;
+using EnsureThat;
 using Microsoft.Extensions.DependencyInjection;
 using Sails.Remoting.Abstractions.Core;
 using Sails.Remoting.Core;
@@ -11,13 +10,12 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddRemotingViaNodeClient(
         this IServiceCollection services,
-        Action<NodeClientOptions> configure)
+        NodeClientOptions options)
     {
         EnsureArg.IsNotNull(services, nameof(services));
-        EnsureArg.IsNotNull(configure, nameof(configure));
+        EnsureArg.IsNotNull(options, nameof(options));
 
-        var serviceCollection = services.Configure(configure);
-        services.AddSingleton<INodeClientProvider, NodeClientProvider>();
+        services.AddSingleton<INodeClientProvider>(_ => new NodeClientProvider(options));
 
         services.AddTransient<IRemotingProvider>(
             serviceProvicer => new RemotingProvider(

diff --git a/net/src/Sails.Remoting/Options/NodeClientOptions.cs b/net/src/Sails.Remoting/Options/NodeClientOptions.cs
@@ -4,5 +4,5 @@ namespace Sails.Remoting.Options;
 
 public sealed record NodeClientOptions
 {
-    public Uri? GearNodeUri { get; set; }
+    public Uri? GearNodeUri { get; init; }
 }
diff --git a/net/src/Sails.Remoting/Sails.Remoting.csproj b/net/src/Sails.Remoting/Sails.Remoting.csproj
@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
-    <PackageReference Include="Microsoft.Extensions.Options" />
     <PackageReference Include="PolySharp">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>