Migrate Startup and drop duplicate container registration code

block-core · Dec 4, 2022 · f503639 · f503639
1 parent 06d3c8a
commit f503639
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 265 deletions.
diff --git a/src/Blockcore.Indexer.Cirrus.Tests/Blockcore.Indexer.Cirrus.Tests.csproj b/src/Blockcore.Indexer.Cirrus.Tests/Blockcore.Indexer.Cirrus.Tests.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-        <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
+        <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
         <PackageReference Include="Moq" Version="4.17.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git a/src/Blockcore.Indexer.Cirrus/CirrusStartup.cs b/src/Blockcore.Indexer.Cirrus/CirrusStartup.cs
@@ -71,8 +71,6 @@ public void ConfigureServices(IServiceCollection services)
          services.AddTransient<ISmartContractTransactionsLookup<NonFungibleTokenContractTable>,NonFungibleTokenSmartContractTransactionsLookup>();
          services.AddTransient(typeof(ISmartContractTransactionsLookup<>), typeof(SmartContractTransactionsLookup<>));
 
-
-
          ScanAssemblyAndRegisterTypeByNameAsTransient(services, typeof(ILogReader<DaoContractTable,DaoContractProposalTable>),
             typeof(ILogReader<DaoContractTable,DaoContractProposalTable>).Assembly);
          ScanAssemblyAndRegisterTypeByNameAsTransient(services, typeof(ILogReader<StandardTokenContractTable,StandardTokenHolderTable>),
@@ -117,34 +115,7 @@ where type.GetInterface(typeToRegister.Name) != null &&
 
       public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
       {
-         app.UseExceptionHandler("/error");
-
-         // Enable Cors
-         app.UseCors("IndexerPolicy");
-
-         app.UseResponseCompression();
-
-         app.UseDefaultFiles();
-
-         app.UseStaticFiles();
-
-         app.UseRouting();
-
-         app.UseSwagger(c =>
-         {
-            c.RouteTemplate = "docs/{documentName}/openapi.json";
-         });
-
-         app.UseSwaggerUI(c =>
-         {
-            c.RoutePrefix = "docs";
-            c.SwaggerEndpoint("/docs/indexer/openapi.json", "Blockcore Indexer API");
-         });
-
-         app.UseEndpoints(endpoints =>
-         {
-            endpoints.MapControllers();
-         });
+         Startup.Configure(app, env);
       }
    }
 }
diff --git a/src/Blockcore.Indexer.Core/Blockcore.Indexer.Core.csproj b/src/Blockcore.Indexer.Core/Blockcore.Indexer.Core.csproj
@@ -4,7 +4,7 @@
       <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
       <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
       <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-      <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
+      <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
       <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
       <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.1" />

diff --git a/src/Blockcore.Indexer.Core/Startup.cs b/src/Blockcore.Indexer.Core/Startup.cs
@@ -32,18 +32,6 @@ namespace Blockcore.Indexer.Core
 {
    public class Startup
    {
-      public IConfiguration Configuration { get; }
-
-      public Startup(IConfiguration configuration)
-      {
-         Configuration = configuration;
-      }
-
-      public void ConfigureServices(IServiceCollection services)
-      {
-         AddIndexerServices(services, Configuration);
-      }
-
       public static void AddIndexerServices(IServiceCollection services, IConfiguration configuration)
       {
          services.Configure<ChainSettings>(configuration.GetSection("Chain"));
@@ -94,9 +82,9 @@ public static void AddIndexerServices(IServiceCollection services, IConfiguratio
          services.AddScoped<TaskStarter, BlockStartup>();
 
          services.AddScoped<TaskRunner, BlockIndexer>();
-
          services.AddScoped<TaskRunner, RichListSync>();
 
+         // TODO: Verify that it is OK we add this to shared Startup for Blockcore and Cirrus.
          services.AddScoped<TaskRunner, HistoryComputer>();
          services.AddSingleton<IComputeHistoryQueue, ComputeHistoryQueue>();
 
@@ -157,9 +145,12 @@ public static void AddIndexerServices(IServiceCollection services, IConfiguratio
          services.AddTransient<IMapMongoBlockToStorageBlock, MapMongoBlockToStorageBlock>();
          services.AddSingleton<ICryptoClientFactory, CryptoClientFactory>();
          services.AddSingleton<ISyncBlockTransactionOperationBuilder, SyncBlockTransactionOperationBuilder>();
+
+         // TODO: Verify that it is OK we add this to shared Startup for Blockcore and Cirrus.
+         services.AddTransient<IBlockRewindOperation, BlockRewindOperation>();
       }
 
-      public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+      public static void Configure(IApplicationBuilder app, IWebHostEnvironment env)
       {
          app.UseExceptionHandler("/error");
 

diff --git a/src/Blockcore.Indexer.Core/Sync/ComputeHistoryQueue.cs b/src/Blockcore.Indexer.Core/Sync/ComputeHistoryQueue.cs
@@ -20,12 +20,15 @@ public ComputeHistoryQueue(IOptions<IndexerSettings> indexerSettings)
 
    public void AddAddressToComputeHistoryQueue(string address)
    {
-      if (indexerSettings.MaxItemsInHistoryQueue <= 0 ||
-          collection.Count >= indexerSettings.MaxItemsInHistoryQueue)
+      if (indexerSettings.MaxItemsInHistoryQueue <= 0 || collection.Count >= indexerSettings.MaxItemsInHistoryQueue)
+      {
          return;
+      }
 
       if (!collection.Contains(address))
+      {
          collection.Enqueue(address);
+      }
    }
 
    public bool GetNextItemFromQueue(out string address)

diff --git a/src/Blockcore.Indexer/BlockcoreStartup.cs b/src/Blockcore.Indexer/BlockcoreStartup.cs
@@ -0,0 +1,28 @@
+using Blockcore.Indexer.Core;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Blockcore.Indexer
+{
+   public class BlockcoreStartup
+   {
+      public IConfiguration Configuration { get; }
+
+      public BlockcoreStartup(IConfiguration configuration)
+      {
+         Configuration = configuration;
+      }
+
+      public void ConfigureServices(IServiceCollection services)
+      {
+         Startup.AddIndexerServices(services, Configuration);
+      }
+
+      public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+      {
+         Startup.Configure(app, env);
+      }
+   }
+}
diff --git a/src/Blockcore.Indexer/Program.cs b/src/Blockcore.Indexer/Program.cs
@@ -38,7 +38,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                   serverOptions.AddServerHeader = false;
                });
 
-               webBuilder.UseStartup<Startup>();
+               webBuilder.UseStartup<BlockcoreStartup>();
             });
    }
 }
diff --git a/src/Blockcore.Indexer/Startup.cs b/src/Blockcore.Indexer/Startup.cs