Cleanup

planetarium · Nov 22, 2024 · 78dea32 · 78dea32
1 parent e055de2
commit 78dea32
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/src/Libplanet.Net/Transports/Libp2pTransport.cs b/src/Libplanet.Net/Transports/Libp2pTransport.cs
@@ -12,6 +12,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Multiformats.Address;
 using Nethermind.Libp2p.Core;
+using Nethermind.Libp2p.Stack;
 using Serilog;
 
 namespace Libplanet.Net.Transports
@@ -91,7 +92,6 @@ public Libp2pTransport(
             _appProtocolVersionOptions.DifferentAppProtocolVersionEncountered;
 
         public static async Task<Libp2pTransport> Create(
-            IServiceProvider serviceProvider,
             PrivateKey privateKey,
             AppProtocolVersionOptions appProtocolVersionOptions,
             HostOptions hostOptions,
@@ -102,6 +102,10 @@ public static async Task<Libp2pTransport> Create(
                 appProtocolVersionOptions,
                 hostOptions,
                 messageTimestampBuffer);
+            var serviceProvider = new ServiceCollection()
+                .AddLibp2p(builder => builder
+                    .AddAppLayerProtocol<ReqRepProtocol>(new ReqRepProtocol(transport)))
+                .BuildServiceProvider();
             await transport.Initialize(serviceProvider);
             return transport;
         }
@@ -288,7 +292,7 @@ public void Dispose()
             _disposed = true;
         }
 
-        public async Task Initialize(
+        private async Task Initialize(
             IServiceProvider serviceProvider,
             CancellationToken cancellationToken = default)
         {

diff --git a/test/Libplanet.Net.Tests/Transports/Libp2pTransportTest.cs b/test/Libplanet.Net.Tests/Transports/Libp2pTransportTest.cs
@@ -21,7 +21,7 @@ namespace Libplanet.Net.Tests.Transports
     public class Libp2pTransportTest : IDisposable
     {
         private bool _disposed;
-        private Serilog.ILogger _logger;
+        private ILogger _logger;
 
         public Libp2pTransportTest(ITestOutputHelper testOutputHelper)
         {
@@ -49,14 +49,17 @@ public async Task Initialize()
             HostOptions hostOptions = new HostOptions("127.0.0.1", new IceServer[] { }, freePort);
             Libp2pTransport transport = new Libp2pTransport(
                 privateKey,
-                default,
+                new AppProtocolVersionOptions(),
                 hostOptions);
             Assert.Throws<NullReferenceException>(() => transport.AsPeer);
             Assert.Throws<NullReferenceException>(() => transport.LocalPeer);
             Assert.Throws<NullReferenceException>(() => transport.Listener);
             Assert.Throws<NullReferenceException>(() => transport.ListenerAddress);
 
-            await transport.Initialize(GetServiceProvider(transport));
+            transport = await Libp2pTransport.Create(
+                privateKey,
+                new AppProtocolVersionOptions(),
+                hostOptions);
             BoundPeer expected = new BoundPeer(
                 CryptoKeyConverter.ToLibplanetPublicKey(
                     CryptoKeyConverter.ToLibp2pIdentity(privateKey).PublicKey),
@@ -121,19 +124,12 @@ public async Task DialToTransports()
                 .ToList();
             List<Libp2pTransport> transports = Enumerable
                 .Range(0, 2)
-                .Select(i => new Libp2pTransport(
+                .Select(async i => await Libp2pTransport.Create(
                     privateKeys[i],
                     new AppProtocolVersionOptions(),
                     hosts[i]))
+                .Select(task => task.Result)
                 .ToList();
-            List<IServiceProvider> serviceProviders = transports
-                .Select(transport => GetServiceProvider(transport))
-                .ToList();
-
-            for (int i = 0; i < count; i++)
-            {
-                await transports[i].Initialize(serviceProviders[i]);
-            }
 
             IRemotePeer remote0 = await transports[0].LocalPeer.DialAsync(
                 transports[1].ListenerAddress, default);
@@ -155,19 +151,12 @@ public async Task RequestReply()
             List<int> freePorts = TestUtils.GetFreePorts(2);
             List<Libp2pTransport> transports = Enumerable
                 .Range(0, count)
-                .Select(i => new Libp2pTransport(
+                .Select(async i => await Libp2pTransport.Create(
                     privateKeys[i],
                     new AppProtocolVersionOptions(),
                     new HostOptions("127.0.0.1", new IceServer[] { }, freePorts[i])))
+                .Select(task => task.Result)
                 .ToList();
-            List<IServiceProvider> serviceProviders = transports
-                .Select(transport => GetServiceProvider(transport))
-                .ToList();
-
-            for (int i = 0; i < count; i++)
-            {
-                await transports[i].Initialize(serviceProviders[i]);
-            }
 
             transports[1].ProcessMessageHandler.Register(async (message, channel) =>
             {