refactor(core-kernel): remove AttributeService in favour of container…

… bindings
ArkEcosystem · Nov 12, 2019 · 27668ac · 27668ac
1 parent 7d449ac
commit 27668ac
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 231 deletions.
diff --git a/__tests__/unit/core-kernel/services/attributes/attribute-service.test.ts b/__tests__/unit/core-kernel/services/attributes/attribute-service.test.ts
diff --git a/__tests__/unit/core-kernel/services/attributes/service-provider.test.ts b/__tests__/unit/core-kernel/services/attributes/service-provider.test.ts
diff --git a/__tests__/unit/core-kernel/utils/delegate-calculator.test.ts b/__tests__/unit/core-kernel/utils/delegate-calculator.test.ts
@@ -3,8 +3,6 @@ import "jest-extended";
 import { Container, Services } from "@arkecosystem/core-kernel";
 import { Sandbox } from "@arkecosystem/core-test-framework";
 
-import { Identifiers } from "@packages/core-kernel/src/ioc";
-import { AttributeService } from "@packages/core-kernel/src/services/attributes";
 import { Wallet } from "@packages/core-state/src/wallets";
 import { Managers, Utils } from "@arkecosystem/crypto";
 import { calculateApproval, calculateForgedTotal } from "@packages/core-kernel/src/utils/delegate-calculator";
@@ -14,11 +12,6 @@ let sandbox: Sandbox;
 beforeAll(() => {
     sandbox = new Sandbox();
 
-    sandbox.app
-        .bind<AttributeService>(Identifiers.AttributeService)
-        .to(AttributeService)
-        .inSingletonScope();
-
     sandbox.app
         .bind<Services.Attributes.AttributeSet>(Container.Identifiers.WalletAttributes)
         .to(Services.Attributes.AttributeSet)

diff --git a/packages/core-kernel/src/bootstrap/app/register-base-service-providers.ts b/packages/core-kernel/src/bootstrap/app/register-base-service-providers.ts
@@ -1,6 +1,6 @@
 import { Application } from "../../contracts/kernel";
 import { Identifiers, inject, injectable } from "../../ioc";
-import { Actions, Attributes, Cache, Filesystem, Log, Queue, Schedule, Validation } from "../../services";
+import { Actions, Cache, Filesystem, Log, Queue, Schedule, Validation } from "../../services";
 import { Bootstrapper } from "../interfaces";
 
 /**
@@ -28,8 +28,6 @@ export class RegisterBaseServiceProviders implements Bootstrapper {
     public async bootstrap(): Promise<void> {
         await this.app.resolve(Actions.ServiceProvider).register();
 
-        await this.app.resolve(Attributes.ServiceProvider).register();
-
         await this.app.resolve(Log.ServiceProvider).register();
 
         await this.app.resolve(Filesystem.ServiceProvider).register();

diff --git a/packages/core-kernel/src/ioc/identifiers.ts b/packages/core-kernel/src/ioc/identifiers.ts
@@ -23,7 +23,6 @@ export const Identifiers: Record<string, symbol> = {
     ValidationManager: Symbol.for("Manager<Validation>"),
     // Services
     ActionService: Symbol.for("Service<Actions>"),
-    AttributeService: Symbol.for("Service<Attribute>"),
     BlockchainService: Symbol.for("Service<Blockchain>"),
     CacheService: Symbol.for("Service<Cache>"),
     ConfigService: Symbol.for("Service<Config>"),

diff --git a/packages/core-kernel/src/services/attributes/attribute-service.ts b/packages/core-kernel/src/services/attributes/attribute-service.ts
diff --git a/packages/core-kernel/src/services/attributes/index.ts b/packages/core-kernel/src/services/attributes/index.ts
@@ -1,5 +1,3 @@
 export * from "./attribute-map";
-export * from "./attribute-service";
 export * from "./attribute-set";
 export * from "./contracts";
-export * from "./service-provider";
diff --git a/packages/core-kernel/src/services/attributes/service-provider.ts b/packages/core-kernel/src/services/attributes/service-provider.ts