refactor(core-state): fire wallet events (#4076)

Author: rainydio

__tests__/integration/core-api/services/__support__/setup.ts

@@ -7,6 +7,7 @@ export const setUp = async (): Promise<Application> => {
     const app = new Application(new Container.Container());
 
     const triggersServiceProvider = app.resolve(Services.Triggers.ServiceProvider);
+    const eventsServiceProvider = app.resolve(Services.Events.ServiceProvider);
     const searchServiceProvider = app.resolve(Services.Search.ServiceProvider);
     const stateServiceProvider = app.resolve(StateServiceProvider);
     const transactionsServiceProvider = app.resolve(TransactionsServiceProvider);
@@ -22,6 +23,7 @@ export const setUp = async (): Promise<Application> => {
     );
 
     await triggersServiceProvider.register();
+    await eventsServiceProvider.register();
     await searchServiceProvider.register();
     await stateServiceProvider.register();
     await transactionsServiceProvider.register();

__tests__/integration/core-magistrate-api/services/__support__/setup.ts

@@ -9,6 +9,7 @@ export const setUp = async (): Promise<Application> => {
     const app = new Application(new Container.Container());
 
     const triggersServiceProvider = app.resolve(Services.Triggers.ServiceProvider);
+    const eventsServiceProvider = app.resolve(Services.Events.ServiceProvider);
     const searchServiceProvider = app.resolve(Services.Search.ServiceProvider);
     const stateServiceProvider = app.resolve(StateServiceProvider);
     const transactionsServiceProvider = app.resolve(TransactionsServiceProvider);
@@ -26,6 +27,7 @@ export const setUp = async (): Promise<Application> => {
     );
 
     await triggersServiceProvider.register();
+    await eventsServiceProvider.register();
     await searchServiceProvider.register();
     await stateServiceProvider.register();
     await transactionsServiceProvider.register();

__tests__/unit/core-manager/service-provider.test.ts

@@ -4,7 +4,6 @@ import { Application, Container, Providers } from "@packages/core-kernel";
 import { defaults } from "@packages/core-manager/src/defaults";
 import { Identifiers } from "@packages/core-manager/src/ioc";
 import { ServiceProvider } from "@packages/core-manager/src/service-provider";
-import { WatcherWallet } from "@packages/core-manager/src/watcher-wallet";
 import { cloneDeep } from "lodash";
 import path from "path";
 import { dirSync, setGracefulCleanup } from "tmp";
@@ -171,21 +170,4 @@ describe("ServiceProvider", () => {
     it("should not be required", async () => {
         await expect(serviceProvider.required()).resolves.toBeFalse();
     });
-
-    it("should create wallet", async () => {
-        const usedDefaults = cloneDeep(defaults);
-
-        usedDefaults.watcher.enabled = true;
-        usedDefaults.watcher.watch.wallets = true;
-
-        setPluginConfiguration(app, serviceProvider, usedDefaults);
-
-        await expect(serviceProvider.register()).toResolve();
-
-        // @ts-ignore
-        const wallet = app.get(Container.Identifiers.WalletFactory)("123");
-        expect(wallet).toBeInstanceOf(WatcherWallet);
-
-        await expect(serviceProvider.dispose()).toResolve();
-    });
 });

__tests__/unit/core-manager/watcher-wallet.test.ts

@@ -12,10 +12,11 @@ import { StateBuilder } from "@packages/core-state/src/state-builder";
 import { StateStore } from "@packages/core-state/src/stores/state";
 import { TransactionValidator } from "@packages/core-state/src/transaction-validator";
 import { WalletRepository, WalletRepositoryClone, WalletRepositoryCopyOnWrite } from "@packages/core-state/src/wallets";
-import { registerFactories, registerIndexers } from "@packages/core-state/src/wallets/indexers";
+import { registerIndexers } from "@packages/core-state/src/wallets/indexers";
 import { Sandbox } from "@packages/core-test-framework/src";
 import { Factories, FactoryBuilder } from "@packages/core-test-framework/src/factories";
 import { Managers, Utils } from "@packages/crypto/src";
+import { walletFactory } from "@arkecosystem/core-state/src/wallets/wallet-factory";
 
 export interface Spies {
     applySpy: jest.SpyInstance;
@@ -31,6 +32,7 @@ export interface Spies {
     getSentTransactionSpy: jest.SpyInstance;
     getRegisteredHandlersSpy: jest.SpyInstance;
     dispatchSpy: jest.SpyInstance;
+    dispatchSyncSpy: jest.SpyInstance;
 }
 
 export interface Setup {
@@ -145,7 +147,6 @@ export const setUp = async (setUpOptions = setUpDefaults, skipBoot = false): Pro
     //     });
 
     registerIndexers(sandbox.app);
-    registerFactories(sandbox.app);
 
     sandbox.app.bind(Container.Identifiers.PluginConfiguration).to(Providers.PluginConfiguration).inSingletonScope();
 
@@ -166,42 +167,6 @@ export const setUp = async (setUpOptions = setUpDefaults, skipBoot = false): Pro
 
     const stateStore: StateStore = sandbox.app.get(Container.Identifiers.StateStore);
 
-    sandbox.app
-        .bind(Container.Identifiers.WalletRepository)
-        .to(WalletRepository)
-        .inSingletonScope()
-        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "blockchain"));
-
-    sandbox.app
-        .bind(Container.Identifiers.WalletRepository)
-        .to(WalletRepositoryClone)
-        .inRequestScope()
-        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "clone"));
-
-    sandbox.app
-        .bind(Container.Identifiers.WalletRepository)
-        .to(WalletRepositoryCopyOnWrite)
-        .inRequestScope()
-        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "copy-on-write"));
-
-    const walletRepoClone: WalletRepositoryClone = sandbox.app.getTagged(
-        Container.Identifiers.WalletRepository,
-        "state",
-        "clone",
-    );
-
-    const walletRepo: WalletRepository = sandbox.app.getTagged(
-        Container.Identifiers.WalletRepository,
-        "state",
-        "blockchain",
-    );
-
-    const walletRepoCopyOnWrite: WalletRepositoryCopyOnWrite = sandbox.app.getTagged(
-        Container.Identifiers.WalletRepository,
-        "state",
-        "copy-on-write",
-    );
-
     const applySpy: jest.SpyInstance = jest.fn();
     const revertSpy: jest.SpyInstance = jest.fn();
 
@@ -244,18 +209,83 @@ export const setUp = async (setUpOptions = setUpDefaults, skipBoot = false): Pro
     }
 
     const dispatchSpy = jest.fn();
+    const dispatchSyncSpy = jest.fn();
 
     @Container.injectable()
     class MockEventDispatcher {
         public dispatch(data) {
             return dispatchSpy(data);
         }
+
+        public dispatchSync(data) {
+            return dispatchSyncSpy(data);
+        }
     }
 
     sandbox.app.container.bind(Container.Identifiers.DatabaseBlockRepository).to(MockBlockRepository);
     sandbox.app.container.bind(Container.Identifiers.DatabaseTransactionRepository).to(MockTransactionRepository);
     sandbox.app.container.bind(Container.Identifiers.EventDispatcherService).to(MockEventDispatcher);
 
+    sandbox.app
+        .bind(Container.Identifiers.WalletRepository)
+        .to(WalletRepository)
+        .inSingletonScope()
+        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "blockchain"));
+
+    sandbox.app
+        .bind(Container.Identifiers.WalletFactory)
+        .toFactory(({ container }) => {
+            return walletFactory(
+                container.get(Container.Identifiers.WalletAttributes),
+                container.get(Container.Identifiers.EventDispatcherService),
+            );
+        })
+        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "blockchain"));
+
+    sandbox.app
+        .bind(Container.Identifiers.WalletRepository)
+        .to(WalletRepositoryClone)
+        .inRequestScope()
+        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "clone"));
+
+    sandbox.app
+        .bind(Container.Identifiers.WalletFactory)
+        .toFactory(({ container }) => {
+            return walletFactory(container.get(Container.Identifiers.WalletAttributes));
+        })
+        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "clone"));
+
+    sandbox.app
+        .bind(Container.Identifiers.WalletRepository)
+        .to(WalletRepositoryCopyOnWrite)
+        .inRequestScope()
+        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "copy-on-write"));
+
+    sandbox.app
+        .bind(Container.Identifiers.WalletFactory)
+        .toFactory(({ container }) => {
+            return walletFactory(container.get(Container.Identifiers.WalletAttributes));
+        })
+        .when(Container.Selectors.anyAncestorOrTargetTaggedFirst("state", "copy-on-write"));
+
+    const walletRepoClone: WalletRepositoryClone = sandbox.app.getTagged(
+        Container.Identifiers.WalletRepository,
+        "state",
+        "clone",
+    );
+
+    const walletRepo: WalletRepository = sandbox.app.getTagged(
+        Container.Identifiers.WalletRepository,
+        "state",
+        "blockchain",
+    );
+
+    const walletRepoCopyOnWrite: WalletRepositoryCopyOnWrite = sandbox.app.getTagged(
+        Container.Identifiers.WalletRepository,
+        "state",
+        "copy-on-write",
+    );
+
     sandbox.app.bind(Container.Identifiers.BlockState).to(BlockState);
 
     sandbox.app
@@ -323,6 +353,7 @@ export const setUp = async (setUpOptions = setUpDefaults, skipBoot = false): Pro
             getSentTransactionSpy,
             getRegisteredHandlersSpy,
             dispatchSpy,
+            dispatchSyncSpy,
         },
     };
 };

__tests__/unit/core-state/setup.ts

@@ -245,8 +245,11 @@ describe("Wallet Repository Copy On Write", () => {
             const wallet = walletRepo.createWallet("abc");
             wallet.setAttribute("delegate", { username: "test" });
             walletRepo.index(wallet);
+            const clone = walletRepoCopyOnWrite.findByIndex(Contracts.State.WalletIndexes.Usernames, "test");
 
-            expect(walletRepoCopyOnWrite.findByIndex(Contracts.State.WalletIndexes.Usernames, "test")).toEqual(wallet);
+            expect(clone).not.toBe(wallet);
+            expect(clone.address).toEqual(wallet.address);
+            expect(clone.getAttribute("delegate.username")).toEqual(wallet.getAttribute("delegate.username"));
         });
     });