refactor: purely rely on in-memory wallets based on transactions (#2209)

* refactor: purely rely on in-memory wallets based on transactions * refactor: purely rely on in-memory wallets based on transactions * fix(core-database-postgres): compare vote balance objects * test: use wallet manager instead of database * refactor(core-database): use no longer used properties * test(core-blockchain): expect call without arguments * fix: await integrity verifier results * test(core-blockchain): do not pass any arguments to buildWallets * test(core-database): remove shutdown assertion * test(core-api): wallet manager reference * refactor(core-database-postgres): remove extraneous object.values call * style(core-database-postgres): naming * Update integrity-verifier.ts * refactor(core-database-postgres): make __ methods private * Update integrity-verifier.ts * refactor(core-database-postgres): remove missed blocks from integrity verifier
ArkEcosystem · Mar 8, 2019 · 477db4c · 477db4c
1 parent d00d471
commit 477db4c
Show file tree

Hide file tree

Showing 35 changed files with 108 additions and 296 deletions.
diff --git a/__tests__/integration/core-api/__support__/setup.ts b/__tests__/integration/core-api/__support__/setup.ts
@@ -1,13 +1,14 @@
 import { app } from "@arkecosystem/core-container";
 import { Database } from "@arkecosystem/core-interfaces";
 import delay from "delay";
-import { registerWithContainer, setUpContainer } from "../../../utils/helpers/container";
 import { plugin } from "../../../../packages/core-api/src/plugin";
+import { registerWithContainer, setUpContainer } from "../../../utils/helpers/container";
 
 import { delegates } from "../../../utils/fixtures";
 import { generateRound } from "./utils/generate-round";
 
-import { queries } from "../../../../packages/core-database-postgres/src/queries";
+import { models } from "@arkecosystem/crypto";
+import { sortBy } from "@arkecosystem/utils";
 
 const round = generateRound(delegates.map(delegate => delegate.publicKey), 1);
 
@@ -32,8 +33,7 @@ async function setUp() {
 
     const databaseService = app.resolvePlugin<Database.IDatabaseService>("database");
     await databaseService.connection.roundsRepository.truncate();
-    await databaseService.buildWallets(1);
-    await databaseService.saveWallets(true);
+    await databaseService.buildWallets();
     await databaseService.saveRound(round);
 
     await registerWithContainer(plugin, options);
@@ -49,9 +49,11 @@ async function tearDown() {
 async function calculateRanks() {
     const databaseService = app.resolvePlugin<Database.IDatabaseService>("database");
 
-    const rows = await (databaseService.connection as any).query.manyOrNone(queries.spv.delegatesRanks);
+    const delegateWallets = Object.values(databaseService.walletManager.allByUsername()).sort(
+        (a: models.Wallet, b: models.Wallet) => b.voteBalance.comparedTo(a.voteBalance),
+    );
 
-    rows.forEach((delegate, i) => {
+    sortBy(delegateWallets, "publicKey").forEach((delegate, i) => {
         const wallet = databaseService.walletManager.findByPublicKey(delegate.publicKey);
         wallet.missedBlocks = +delegate.missedBlocks;
         (wallet as any).rate = i + 1;

diff --git a/__tests__/integration/core-blockchain/blockchain.test.ts b/__tests__/integration/core-blockchain/blockchain.test.ts
@@ -342,7 +342,7 @@ async function __resetToHeight1() {
         // Make sure the wallet manager has been fed or else revertRound
         // cannot determine the previous delegates. This is only necessary, because
         // the database is not dropped after the unit tests are done.
-        await blockchain.database.buildWallets(lastBlock.data.height);
+        await blockchain.database.buildWallets();
 
         // Index the genesis wallet or else revert block at height 1 fails
         const generator = crypto.getAddress(genesisBlock.data.generatorPublicKey);

diff --git a/__tests__/unit/core-api/__support__/setup.ts b/__tests__/unit/core-api/__support__/setup.ts
@@ -7,7 +7,8 @@ import { registerWithContainer, setUpContainer } from "../../../utils/helpers/co
 import { delegates } from "../../../utils/fixtures";
 import { generateRound } from "./utils/generate-round";
 
-import { queries } from "../../../../packages/core-database-postgres/src/queries";
+import { models } from "@arkecosystem/crypto";
+import { sortBy } from "@arkecosystem/utils";
 
 const round = generateRound(delegates.map(delegate => delegate.publicKey), 1);
 
@@ -33,8 +34,7 @@ async function setUp() {
 
     const databaseService = app.resolvePlugin<Database.IDatabaseService>("database");
     await databaseService.connection.roundsRepository.truncate();
-    await databaseService.buildWallets(1);
-    await databaseService.saveWallets(true);
+    await databaseService.buildWallets();
     await databaseService.saveRound(round);
 
     await registerWithContainer(plugin, options);
@@ -50,9 +50,11 @@ async function tearDown() {
 async function calculateRanks() {
     const databaseService = app.resolvePlugin<Database.IDatabaseService>("database");
 
-    const rows = await (databaseService.connection as any).query.manyOrNone(queries.spv.delegatesRanks);
+    const delegateWallets = Object.values(databaseService.walletManager.allByUsername()).sort(
+        (a: models.Wallet, b: models.Wallet) => b.voteBalance.comparedTo(a.voteBalance),
+    );
 
-    rows.forEach((delegate, i) => {
+    sortBy(delegateWallets, "publicKey").forEach((delegate, i) => {
         const wallet = databaseService.walletManager.findByPublicKey(delegate.publicKey);
         wallet.missedBlocks = +delegate.missedBlocks;
         (wallet as any).rate = i + 1;

diff --git a/__tests__/unit/core-blockchain/blockchain.test.ts b/__tests__/unit/core-blockchain/blockchain.test.ts
@@ -368,7 +368,7 @@ async function __resetToHeight1() {
         // Make sure the wallet manager has been fed or else revertRound
         // cannot determine the previous delegates. This is only necessary, because
         // the database is not dropped after the unit tests are done.
-        await blockchain.database.buildWallets(lastBlock.data.height);
+        await blockchain.database.buildWallets();
 
         // Index the genesis wallet or else revert block at height 1 fails
         const generator = crypto.getAddress(genesisBlock.data.generatorPublicKey);

diff --git a/__tests__/unit/core-blockchain/state-machine.test.ts b/__tests__/unit/core-blockchain/state-machine.test.ts
@@ -225,8 +225,6 @@ describe("State Machine", () => {
                     // @ts-ignore
                     buildWallets: jest.spyOn(blockchain.database, "buildWallets").mockReturnValue(true),
                     // @ts-ignore
-                    saveWallets: jest.spyOn(blockchain.database, "saveWallets").mockReturnValue(true),
-                    // @ts-ignore
                     applyRound: jest.spyOn(blockchain.database, "applyRound").mockReturnValue(true),
                     // @ts-ignore
                     getActiveDelegates: jest.spyOn(blockchain.database, "getActiveDelegates").mockReturnValue(true),
@@ -290,8 +288,7 @@ describe("State Machine", () => {
                 stateStorage.networkStart = true;
 
                 await expect(() => actionMap.init()).toDispatch(blockchain, "STARTED");
-                expect(databaseMocks.buildWallets).toHaveBeenCalledWith(1);
-                expect(databaseMocks.saveWallets).toHaveBeenCalledWith(true);
+                expect(databaseMocks.buildWallets).toHaveBeenCalled();
                 expect(databaseMocks.applyRound).toHaveBeenCalledWith(1);
 
                 stateStorage.networkStart = false; // reset to default value
@@ -303,7 +300,7 @@ describe("State Machine", () => {
                 const loggerVerbose = jest.spyOn(logger, "verbose");
 
                 await expect(() => actionMap.init()).toDispatch(blockchain, "STARTED");
-                expect(databaseMocks.buildWallets).toHaveBeenCalledWith(1);
+                expect(databaseMocks.buildWallets).toHaveBeenCalled();
                 expect(loggerVerbose).toHaveBeenCalledWith(
                     "TEST SUITE DETECTED! SYNCING WALLETS AND STARTING IMMEDIATELY.",
                 );
@@ -334,7 +331,6 @@ describe("State Machine", () => {
                 expect(loggerWarn).toHaveBeenCalledWith(
                     "Rebuilding wallets table because of some inconsistencies. Most likely due to an unfortunate shutdown.",
                 );
-                expect(databaseMocks.saveWallets).toHaveBeenCalledWith(true);
             });
 
             it("should clean round data if new round starts at block.height + 1 (and dispatch STARTED)", async () => {

diff --git a/__tests__/unit/core-database/__fixtures__/database-connection-stub.ts b/__tests__/unit/core-database/__fixtures__/database-connection-stub.ts
@@ -10,7 +10,7 @@ export class DatabaseConnectionStub implements Database.IDatabaseConnection {
     public walletsRepository: Database.IWalletsRepository;
     public options: any;
 
-    public buildWallets(height: number): Promise<boolean> {
+    public buildWallets(): Promise<boolean> {
         return undefined;
     }
 
@@ -43,8 +43,4 @@ export class DatabaseConnectionStub implements Database.IDatabaseConnection {
     public saveBlock(block: models.Block): Promise<any> {
         return undefined;
     }
-
-    public saveWallets(wallets: any[], force?: boolean): Promise<void> {
-        return undefined;
-    }
 }
diff --git a/__tests__/unit/core-database/database-service.test.ts b/__tests__/unit/core-database/database-service.test.ts
@@ -49,7 +49,6 @@ describe("Database Service", () => {
 
         expect(emitter.on).toHaveBeenCalledWith("state:started", expect.toBeFunction());
         expect(emitter.on).toHaveBeenCalledWith("wallet.created.cold", expect.toBeFunction());
-        expect(emitter.once).toHaveBeenCalledWith("shutdown", expect.toBeFunction());
     });
 
     describe("applyBlock", () => {

diff --git a/packages/core-blockchain/src/state-machine.ts b/packages/core-blockchain/src/state-machine.ts
@@ -169,8 +169,7 @@ blockchainMachine.actionMap = (blockchain: Blockchain) => ({
             stateStorage.lastDownloadedBlock = block;
 
             if (stateStorage.networkStart) {
-                await blockchain.database.buildWallets(block.data.height);
-                await blockchain.database.saveWallets(true);
+                await blockchain.database.buildWallets();
                 await blockchain.database.applyRound(block.data.height);
                 await blockchain.transactionPool.buildWallets();
 
@@ -181,7 +180,7 @@ blockchainMachine.actionMap = (blockchain: Blockchain) => ({
                 logger.verbose("TEST SUITE DETECTED! SYNCING WALLETS AND STARTING IMMEDIATELY.");
 
                 stateStorage.setLastBlock(new Block(config.get("genesisBlock")));
-                await blockchain.database.buildWallets(block.data.height);
+                await blockchain.database.buildWallets();
 
                 return blockchain.dispatch("STARTED");
             }
@@ -198,13 +197,12 @@ blockchainMachine.actionMap = (blockchain: Blockchain) => ({
             /** *******************************
              * database init                 *
              ******************************* */
-            // SPV rebuild
-            const verifiedWalletsIntegrity = await blockchain.database.buildWallets(block.data.height);
+            // Integrity Verification
+            const verifiedWalletsIntegrity = await blockchain.database.buildWallets();
             if (!verifiedWalletsIntegrity && block.data.height > 1) {
                 logger.warn(
                     "Rebuilding wallets table because of some inconsistencies. Most likely due to an unfortunate shutdown.",
                 );
-                await blockchain.database.saveWallets(true);
             }
 
             // NOTE: if the node is shutdown between round, the round has already been applied

diff --git a/packages/core-container/src/container.ts b/packages/core-container/src/container.ts
@@ -265,9 +265,6 @@ export class Container implements container.IContainer {
 
                     // Wait for event to be emitted and give time to finish
                     await delay(1000);
-
-                    // Save dirty wallets
-                    await database.saveWallets(false);
                 }
             } catch (error) {
                 // tslint:disable-next-line:no-console

diff --git a/packages/core-database-postgres/src/index.ts b/packages/core-database-postgres/src/index.ts
@@ -1,6 +1,6 @@
 export * from "./postgres-connection";
 export * from "./migrations";
-export * from "./spv";
+export * from "./integrity-verifier";
 export * from "./models";
 export * from "./repositories";
 export * from "./plugin";