Merge pull request #2242 from area363/fix-duplicate-publisher

fix duplicate publisher in RPC mode
planetarium · Sep 14, 2023 · b8e793e · b8e793e
2 parents 83e5f84 + 9afd210
commit b8e793e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 21 deletions.
diff --git a/NineChronicles.Headless.Executable/Program.cs b/NineChronicles.Headless.Executable/Program.cs
@@ -488,7 +488,9 @@ IActionLoader MakeSingleActionLoader()
                                 .AddAspNetCoreInstrumentation()
                                 .AddPrometheusExporter());
                 });
-                hostBuilder.UseNineChroniclesNode(nineChroniclesProperties, standaloneContext);
+
+                NineChroniclesNodeService service =
+                    NineChroniclesNodeService.Create(nineChroniclesProperties, standaloneContext);
                 if (headlessConfig.RpcServer)
                 {
                     var context = new RpcContext
@@ -512,13 +514,40 @@ IActionLoader MakeSingleActionLoader()
                         new ConcurrentDictionary<string, Sentry.ITransaction>()
                     );
 
+                    hostBuilder.UseNineChroniclesNode(
+                        nineChroniclesProperties,
+                        standaloneContext,
+                        publisher,
+                        service);
                     hostBuilder.UseNineChroniclesRPC(
                         rpcProperties,
                         publisher,
                         standaloneContext,
                         configuration
                     );
                 }
+                else
+                {
+                    var context = new RpcContext
+                    {
+                        RpcRemoteSever = false
+                    };
+                    var publisher = new ActionEvaluationPublisher(
+                        standaloneContext.NineChroniclesNodeService!.BlockRenderer,
+                        standaloneContext.NineChroniclesNodeService!.ActionRenderer,
+                        standaloneContext.NineChroniclesNodeService!.ExceptionRenderer,
+                        standaloneContext.NineChroniclesNodeService!.NodeStatusRenderer,
+                        IPAddress.Loopback.ToString(),
+                        0,
+                        context,
+                        new ConcurrentDictionary<string, Sentry.ITransaction>()
+                    );
+                    hostBuilder.UseNineChroniclesNode(
+                        nineChroniclesProperties,
+                        standaloneContext,
+                        publisher,
+                        service);
+                }
 
                 await hostBuilder.RunConsoleAsync(cancellationToken ?? Context.CancellationToken);
             }

diff --git a/NineChronicles.Headless/HostBuilderExtensions.cs b/NineChronicles.Headless/HostBuilderExtensions.cs
@@ -26,15 +26,11 @@ public static class HostBuilderExtensions
         public static IHostBuilder UseNineChroniclesNode(
             this IHostBuilder builder,
             NineChroniclesNodeServiceProperties properties,
-            StandaloneContext context
+            StandaloneContext context,
+            ActionEvaluationPublisher actionEvaluationPublisher,
+            NineChroniclesNodeService service
         )
         {
-            NineChroniclesNodeService service =
-                NineChroniclesNodeService.Create(properties, context);
-            var rpcContext = new RpcContext
-            {
-                RpcRemoteSever = false
-            };
             return builder.ConfigureServices(services =>
             {
                 services.AddHostedService(provider => service);
@@ -53,19 +49,8 @@ StandaloneContext context
                 {
                     services.AddSingleton<LibplanetNodeServiceProperties>(provider => libplanetNodeServiceProperties);
                 }
-                services.AddSingleton(provider =>
-                {
-                    return new ActionEvaluationPublisher(
-                        context.NineChroniclesNodeService!.BlockRenderer,
-                        context.NineChroniclesNodeService!.ActionRenderer,
-                        context.NineChroniclesNodeService!.ExceptionRenderer,
-                        context.NineChroniclesNodeService!.NodeStatusRenderer,
-                        IPAddress.Loopback.ToString(),
-                        0,
-                        rpcContext,
-                        provider.GetRequiredService<ConcurrentDictionary<string, ITransaction>>()
-                    );
-                });
+
+                services.AddSingleton(_ => actionEvaluationPublisher);
             });
         }