Rc v200220 arena

NineChronicles.Headless.Executable/Configuration.cs

@@ -95,6 +95,8 @@ public class Configuration
 
         public int ArenaParticipantsSyncInterval { get; set; } = 1000;
 
+        public string RedisConnectionString { get; set; } = "";
+
         public void Overwrite(
             string? appProtocolVersionString,
             string[]? trustedAppProtocolVersionSignerStrings,
@@ -144,7 +146,8 @@ public void Overwrite(
             int? consensusProposeSecondBase,
             int? maxTransactionPerBlock,
             int? arenaParticipantsSyncInterval,
-            bool? remoteKeyValueService
+            bool? remoteKeyValueService,
+            string? redisConnectionString
         )
         {
             AppProtocolVersionString = appProtocolVersionString ?? AppProtocolVersionString;
@@ -197,6 +200,7 @@ public void Overwrite(
             MaxTransactionPerBlock = maxTransactionPerBlock ?? MaxTransactionPerBlock;
             ArenaParticipantsSyncInterval = arenaParticipantsSyncInterval ?? ArenaParticipantsSyncInterval;
             RemoteKeyValueService = remoteKeyValueService ?? RemoteKeyValueService;
+            RedisConnectionString = redisConnectionString ?? RedisConnectionString;
         }
     }
 }

NineChronicles.Headless.Executable/Program.cs

@@ -37,11 +37,12 @@
 using Libplanet.Headless.Hosting;
 using Libplanet.Net.Transports;
 using Nekoyume.Action.Loader;
-using OpenTelemetry;
 using OpenTelemetry.Metrics;
 using Nekoyume;
+using NineChronicles.Headless.Services;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
+using StackExchange.Redis;
 
 namespace NineChronicles.Headless.Executable
 {
@@ -218,9 +219,11 @@ public async Task Run(
             [Option(Description = "arena participants list sync interval time")]
             int? arenaParticipantsSyncInterval = null,
             [Option(Description = "arena participants list sync enable")]
-            bool arenaParticipantsSync = true,
+            bool arenaParticipantsSync = false,
             [Option(Description = "[DANGER] Turn on RemoteKeyValueService to debug.")]
             bool remoteKeyValueService = false,
+            [Option(Description = "redis cache connection string")]
+            string? redisConnectionString = "localhost:6379",
             [Ignore] CancellationToken? cancellationToken = null
         )
         {
@@ -303,7 +306,7 @@ public async Task Run(
                 txLifeTime, messageTimeout, tipTimeout, demandBuffer, skipPreload,
                 minimumBroadcastTarget, bucketSize, chainTipStaleBehaviorType, txQuotaPerSigner, maximumPollPeers,
                 consensusPort, consensusPrivateKeyString, consensusSeedStrings, consensusTargetBlockIntervalMilliseconds, consensusProposeSecondBase,
-                maxTransactionPerBlock, arenaParticipantsSyncInterval, remoteKeyValueService
+                maxTransactionPerBlock,  arenaParticipantsSyncInterval, remoteKeyValueService, redisConnectionString
             );
 
             // Clean-up previous temporary log files.
@@ -439,9 +442,20 @@ IActionLoader MakeSingleActionLoader()
                     };
                 var arenaMemoryCache = new StateMemoryCache();
                 string otlpEndpoint = Environment.GetEnvironmentVariable("OTLP_ENDPOINT") ?? "http://localhost:4317";
+                var configurationOptions = new ConfigurationOptions
+                {
+                    EndPoints = { headlessConfig.RedisConnectionString },
+                    ConnectTimeout = 5000,
+                    SyncTimeout = 5000,
+                };
+
+                var redis = await ConnectionMultiplexer.ConnectAsync(configurationOptions);
+                var arenaParticipantsService = new RedisArenaParticipantsService(redis);
+
                 hostBuilder.ConfigureServices(services =>
                 {
                     services.AddSingleton(_ => standaloneContext);
+                    services.AddSingleton<IConnectionMultiplexer>(_ => redis);
                     services.AddOpenTelemetry()
                         .ConfigureResource(resource => resource.AddService(
                                 serviceName: Assembly.GetEntryAssembly()?.GetName().Name ?? "NineChronicles.Headless",
@@ -473,11 +487,8 @@ IActionLoader MakeSingleActionLoader()
                         );
 
                     // worker
-                    if (arenaParticipantsSync)
-                    {
-                        services.AddHostedService(_ => new ArenaParticipantsWorker(arenaMemoryCache, standaloneContext, headlessConfig.ArenaParticipantsSyncInterval));
-                    }
                     services.AddSingleton(arenaMemoryCache);
+                    services.AddScoped<IRedisArenaParticipantsService, RedisArenaParticipantsService>(_ => arenaParticipantsService);
                 });
 
                 NineChroniclesNodeService service =

NineChronicles.Headless.Tests/GraphQLTestUtils.cs

@@ -19,12 +19,15 @@
 using Libplanet.Types.Consensus;
 using Libplanet.Types.Tx;
 using Microsoft.Extensions.DependencyInjection;
+using Moq;
 using Nekoyume;
 using Nekoyume.Action;
 using Nekoyume.Action.Loader;
 using Nekoyume.Model.State;
 using Nekoyume.Module;
+using NineChronicles.Headless.Services;
 using NineChronicles.Headless.Utils;
+using StackExchange.Redis;
 
 namespace NineChronicles.Headless.Tests
 {
@@ -62,6 +65,11 @@ public static Task<ExecutionResult> ExecuteQueryAsync<TObjectGraphType>(
             services.AddLibplanetExplorer();
             services.AddSingleton<StateMemoryCache>();
 
+            var connectionMultiplexer = new Mock<IConnectionMultiplexer>();
+            var service = new RedisArenaParticipantsService(connectionMultiplexer.Object);
+            services.AddSingleton<IConnectionMultiplexer>(_ => connectionMultiplexer.Object);
+            services.AddScoped<IRedisArenaParticipantsService, RedisArenaParticipantsService>(_ => service);
+
             var serviceProvider = services.BuildServiceProvider();
             return ExecuteQueryAsync<TObjectGraphType>(
                 serviceProvider,

NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs

@@ -1,7 +1,5 @@
 using GraphQL;
-using Libplanet;
 using Libplanet.Action;
-using Libplanet.Action.Loader;
 using Libplanet.Action.Sys;
 using Libplanet.Types.Assets;
 using Libplanet.Blockchain;
@@ -12,15 +10,11 @@
 using Libplanet.Headless.Hosting;
 using Libplanet.KeyStore;
 using Libplanet.Net;
-using Libplanet.Store;
-using Libplanet.Store.Trie;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Nekoyume.Action;
-using Nekoyume.Action.Loader;
 using Nekoyume.Model.State;
 using Nekoyume.TableData;
-using Nekoyume.Blockchain.Policy;
 using NineChronicles.Headless.GraphTypes;
 using NineChronicles.Headless.Tests.Common;
 using Serilog;
@@ -35,6 +29,9 @@
 using System.Threading.Tasks;
 using Bencodex.Types;
 using Libplanet.Types.Tx;
+using Moq;
+using NineChronicles.Headless.Services;
+using StackExchange.Redis;
 using Xunit.Abstractions;
 
 namespace NineChronicles.Headless.Tests.GraphTypes
@@ -123,6 +120,10 @@ public GraphQLTestBase(ITestOutputHelper output)
             services.AddSingleton(ncService);
             services.AddSingleton(ncService.Store);
             services.AddSingleton<StateMemoryCache>();
+            var connectionMultiplexer = new Mock<IConnectionMultiplexer>();
+            var service = new RedisArenaParticipantsService(connectionMultiplexer.Object);
+            services.AddSingleton<IConnectionMultiplexer>(_ => connectionMultiplexer.Object);
+            services.AddScoped<IRedisArenaParticipantsService, RedisArenaParticipantsService>(_ => service);
             ServiceProvider serviceProvider = services.BuildServiceProvider();
             Schema = new StandaloneSchema(serviceProvider);
 

NineChronicles.Headless.Tests/GraphTypes/StateQueryTest.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
@@ -22,7 +21,6 @@
 using Nekoyume.TableData;
 using NineChronicles.Headless.GraphTypes;
 using NineChronicles.Headless.GraphTypes.States;
-using NineChronicles.Headless.Tests.Common;
 using Xunit;
 using static NineChronicles.Headless.Tests.GraphQLTestUtils;
 

NineChronicles.Headless.Tests/NineChronicles.Headless.Tests.csproj

@@ -25,6 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="8.49.0.57237">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>