feat(core-kernel): load crypto configuration from directory

ArkEcosystem · Sep 24, 2019 · b37233e · b37233e
1 parent 8df2f12
commit b37233e
Show file tree

Hide file tree

Showing 17 changed files with 275 additions and 114 deletions.
diff --git a/__tests__/unit/core-kernel/application.test.ts b/__tests__/unit/core-kernel/application.test.ts
@@ -84,7 +84,9 @@ describe("Application", () => {
 
         const serviceProviderRepository = new ServiceProviderRepository();
         app.bind(Identifiers.ServiceProviderRepository).toConstantValue(serviceProviderRepository);
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider = app.resolve(StubServiceProvider);
         const spyRegister = jest.spyOn(serviceProvider, "register");
@@ -111,7 +113,9 @@ describe("Application", () => {
 
         const serviceProviderRepository = new ServiceProviderRepository();
         app.bind(Identifiers.ServiceProviderRepository).toConstantValue(serviceProviderRepository);
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider = app.resolve(StubServiceProvider);
         const spyRegister = jest.spyOn(serviceProvider, "register");
@@ -131,7 +135,11 @@ describe("Application", () => {
     });
 
     it("should get and set the given configuration value", () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({ key: "Hello World" }));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
+
+        app.get<ConfigRepository>(Identifiers.ConfigRepository).merge({ key: "Hello World" });
 
         expect(app.config("key")).toBe("Hello World");
 
@@ -386,7 +394,9 @@ describe("Application", () => {
 
         const serviceProviderRepository = new ServiceProviderRepository();
         app.bind(Identifiers.ServiceProviderRepository).toConstantValue(serviceProviderRepository);
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider = app.resolve(StubServiceProvider);
         const spyDispose = jest.spyOn(serviceProvider, "dispose");
@@ -410,7 +420,9 @@ describe("Application", () => {
 
         const serviceProviderRepository = new ServiceProviderRepository();
         app.bind(Identifiers.ServiceProviderRepository).toConstantValue(serviceProviderRepository);
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider = app.resolve(StubServiceProvider);
         const spyDispose = jest.spyOn(serviceProvider, "dispose");
@@ -435,7 +447,9 @@ describe("Application", () => {
 
         const serviceProviderRepository = new ServiceProviderRepository();
         app.bind(Identifiers.ServiceProviderRepository).toConstantValue(serviceProviderRepository);
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider = app.resolve(StubServiceProvider);
         const spyDispose = jest.spyOn(serviceProvider, "dispose");

diff --git a/__tests__/unit/core-kernel/bootstrap/app/load-service-providers.test.ts b/__tests__/unit/core-kernel/bootstrap/app/load-service-providers.test.ts
@@ -19,36 +19,42 @@ let serviceProviderRepository: ServiceProviderRepository;
 
 beforeEach(() => {
     container = new Container();
-    container.snapshot();
 
     app = new Application(container);
 
-    serviceProviderRepository = new ServiceProviderRepository();
-    app.bind(Identifiers.ServiceProviderRepository).toConstantValue(serviceProviderRepository);
+    app.bind(Identifiers.ConfigRepository)
+        .to(ConfigRepository)
+        .inSingletonScope();
+
+    app.bind(Identifiers.ServiceProviderRepository)
+        .to(ServiceProviderRepository)
+        .inSingletonScope();
+
+    configRepository = app.get<ConfigRepository>(Identifiers.ConfigRepository);
+
+    serviceProviderRepository = app.get<ServiceProviderRepository>(Identifiers.ServiceProviderRepository);
+
+    container.snapshot();
 });
 
 afterEach(() => container.restore());
 
 describe("LoadServiceProviders", () => {
     it("should bootstrap with defaults", async () => {
-        configRepository = new ConfigRepository({
+        configRepository.merge({
             app: { plugins: [{ package: resolve(__dirname, "../../__stubs__/stub-plugin-with-defaults") }] },
         });
 
-        app.bind(Identifiers.ConfigRepository).toConstantValue(configRepository);
-
         serviceProviderRepository.set("stub", new StubServiceProvider());
 
         await app.resolve<LoadServiceProviders>(LoadServiceProviders).bootstrap();
     });
 
     it("should bootstrap without defaults", async () => {
-        configRepository = new ConfigRepository({
+        configRepository.merge({
             app: { plugins: [{ package: resolve(__dirname, "../../__stubs__/stub-plugin") }] },
         });
 
-        app.bind(Identifiers.ConfigRepository).toConstantValue(configRepository);
-
         serviceProviderRepository.set("stub", new StubServiceProvider());
 
         await app.resolve<LoadServiceProviders>(LoadServiceProviders).bootstrap();

diff --git a/__tests__/unit/core-kernel/bootstrap/service-providers/boot-service-providers.test.ts b/__tests__/unit/core-kernel/bootstrap/service-providers/boot-service-providers.test.ts
@@ -43,7 +43,9 @@ afterEach(() => container.restore());
 
 describe("BootServiceProviders", () => {
     it("RequiredFaultyBootServiceProvider", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new RequiredFaultyBootServiceProvider();
         serviceProviderRepository.set("stub", serviceProvider);
@@ -54,7 +56,9 @@ describe("BootServiceProviders", () => {
     });
 
     it("FaultyBootServiceProvider", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new FaultyBootServiceProvider();
         const spyBoot = jest.spyOn(serviceProvider, "boot");
@@ -66,7 +70,9 @@ describe("BootServiceProviders", () => {
     });
 
     it("DeferredServiceProvider", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new DeferredServiceProvider();
         const spyBoot = jest.spyOn(serviceProvider, "boot");
@@ -79,7 +85,9 @@ describe("BootServiceProviders", () => {
     });
 
     it("DeferredServiceProvider - failed", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new DeferredServiceProvider();
         const spyBoot = jest.spyOn(serviceProvider, "boot");
@@ -98,7 +106,9 @@ describe("BootServiceProviders", () => {
     });
 
     it("DeferredServiceProvider - enableWhen", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new DeferredServiceProvider();
         const spyBoot = jest.spyOn(serviceProvider, "boot");
@@ -118,7 +128,9 @@ describe("BootServiceProviders", () => {
     });
 
     it("DeferredServiceProvider - disableWhen", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new DeferredServiceProvider();
         const spyDispose = jest.spyOn(serviceProvider, "dispose");

diff --git a/__tests__/unit/core-kernel/bootstrap/service-providers/register-service-providers.test.ts b/__tests__/unit/core-kernel/bootstrap/service-providers/register-service-providers.test.ts
@@ -56,7 +56,9 @@ afterEach(() => container.restore());
 
 describe("RegisterServiceProviders", () => {
     it("should bootstrap with a basic service provider", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new StubServiceProvider();
         const spyRegister = jest.spyOn(serviceProvider, "register");
@@ -68,7 +70,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should respect the include configuration", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         app.get<ConfigRepository>(Identifiers.ConfigRepository).set("include", ["stub-other"]);
 
@@ -82,7 +86,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should respect the exclude configuration", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         app.get<ConfigRepository>(Identifiers.ConfigRepository).set("exclude", ["stub"]);
 
@@ -96,7 +102,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should bootstrap if the configuration validation passes", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new ValidConfigurationServiceProvider();
         serviceProvider.setManifest(app.resolve(PluginManifest));
@@ -117,7 +125,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should mark the service provider as failed if the configuration validation fails", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new InvalidConfigurationServiceProvider();
         serviceProvider.setManifest(app.resolve(PluginManifest));
@@ -134,7 +144,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should throw if the service provider is required and the configuration validation fails", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new RequiredInvalidConfigurationServiceProvider();
         serviceProvider.setManifest(app.resolve(PluginManifest));
@@ -154,7 +166,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should terminate if a required (boolean) dependency cannot be found", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new RequiredDependencyCannotBeFoundServiceProvider();
         serviceProvider.setManifest(app.resolve(PluginManifest));
@@ -170,7 +184,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should terminate if a required (async) dependency cannot be found", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new RequiredDependencyCannotBeFoundAsyncServiceProvider();
         serviceProvider.setManifest(app.resolve(PluginManifest));
@@ -188,7 +204,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should mark the service provider as failed and log a warning if an optional dependency cannot be found", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new OptionalDependencyCannotBeFoundServiceProvider();
         serviceProvider.setManifest(app.resolve(PluginManifest));
@@ -205,7 +223,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should terminate if a required dependency cannot satisfy the version", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new RequiredDependencyVersionCannotBeSatisfiedServiceProvider();
         serviceProvider.setManifest(app.resolve(PluginManifest));
@@ -222,7 +242,9 @@ describe("RegisterServiceProviders", () => {
     });
 
     it("should mark the service provider as failed and log a warning if an optional dependency cannot satisfy the version", async () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = new OptionalDependencyVersionCannotBeSatisfiedServiceProvider();
         serviceProvider.setManifest(app.resolve(PluginManifest));

diff --git a/__tests__/unit/core-kernel/providers/plugin-configuration.test.ts b/__tests__/unit/core-kernel/providers/plugin-configuration.test.ts
@@ -14,7 +14,9 @@ beforeEach(() => {
     container.snapshot();
 
     app = new Application(container);
-    app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+    app.bind(Identifiers.ConfigRepository)
+        .to(ConfigRepository)
+        .inSingletonScope();
 
     pluginConfiguration = app.resolve<PluginConfiguration>(PluginConfiguration);
 });

diff --git a/__tests__/unit/core-kernel/providers/plugin-manifest.test.ts b/__tests__/unit/core-kernel/providers/plugin-manifest.test.ts
@@ -14,7 +14,9 @@ beforeEach(() => {
     container.snapshot();
 
     app = new Application(container);
-    app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+    app.bind(Identifiers.ConfigRepository)
+        .to(ConfigRepository)
+        .inSingletonScope();
 
     pluginConfiguration = app.resolve<PluginManifest>(PluginManifest);
 });

diff --git a/__tests__/unit/core-kernel/providers/service-provider.test.ts b/__tests__/unit/core-kernel/providers/service-provider.test.ts
@@ -91,7 +91,9 @@ describe("ServiceProvider", () => {
     });
 
     it(".config", () => {
-        app.bind(Identifiers.ConfigRepository).toConstantValue(new ConfigRepository({}));
+        app.bind(Identifiers.ConfigRepository)
+            .to(ConfigRepository)
+            .inSingletonScope();
 
         const serviceProvider: ServiceProvider = app.resolve(StubServiceProvider);
 

diff --git a/__tests__/unit/core-kernel/services/config/drivers/local.test.ts b/__tests__/unit/core-kernel/services/config/drivers/local.test.ts
@@ -3,6 +3,7 @@ import { dirSync, setGracefulCleanup } from "tmp";
 
 import { LocalConfigLoader } from "@packages/core-kernel/src/services/config/drivers/local";
 import { Application } from "@packages/core-kernel/src/application";
+import { ConfigRepository } from "@packages/core-kernel/src/services/config/repository";
 import { Container, Identifiers, interfaces } from "@packages/core-kernel/src/ioc";
 import { ServiceProviderRepository } from "@packages/core-kernel/src/providers";
 import { MemoryEventDispatcher } from "@packages/core-kernel/src/services/events/drivers/memory";
@@ -22,6 +23,9 @@ beforeEach(() => {
     container.snapshot();
 
     app = new Application(container);
+    app.bind(Identifiers.ConfigRepository)
+        .to(ConfigRepository)
+        .inSingletonScope();
     app.bind(Identifiers.EventDispatcherService).toConstantValue(new MemoryEventDispatcher());
     app.bind(Identifiers.ServiceProviderRepository).toConstantValue(new ServiceProviderRepository());
     app.bind("path.config").toConstantValue(configPath);

diff --git a/__tests__/unit/core-kernel/services/config/repository.test.ts b/__tests__/unit/core-kernel/services/config/repository.test.ts
@@ -2,7 +2,7 @@ import "jest-extended";
 import { ConfigRepository } from "@packages/core-kernel/src/services/config/repository";
 
 let configRepository: ConfigRepository;
-beforeEach(() => (configRepository = new ConfigRepository({})));
+beforeEach(() => (configRepository = new ConfigRepository()));
 
 describe("ConfigRepository", () => {
     it("should set, get and unset the given key-value", () => {