Merge remote-tracking branch 'ArkEcosystem/core/develop' into nonces

* ArkEcosystem/core/develop: fix(core-blockchain): use resolveOptions("blockchain") to get databaseRollback options (#2572) refactor: change hasExceededMaxTransactions()'s argument type (#2568)
ArkEcosystem · May 13, 2019 · 5b15270 · 5b15270
2 parents 82261ae + e1111a5
commit 5b15270
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 34 deletions.
diff --git a/__tests__/integration/core-transaction-pool/processor.test.ts b/__tests__/integration/core-transaction-pool/processor.test.ts
@@ -1119,7 +1119,7 @@ describe("Transaction Guard", () => {
     //             .withPassphrase(wallets[10].passphrase)
     //             .create(3);
 
-    //         jest.spyOn(processor.pool, "hasExceededMaxTransactions").mockImplementationOnce(tx => true);
+    //         jest.spyOn(processor.pool, "hasExceededMaxTransactions").mockImplementationOnce(senderPublicKey => true);
 
     //         processor.__filterAndTransformTransactions(transactions);
 

diff --git a/__tests__/unit/core-blockchain/mocks/container.ts b/__tests__/unit/core-blockchain/mocks/container.ts
@@ -58,7 +58,7 @@ export const container = {
 
             return undefined;
         },
-        resolveOptions: () => ({}),
+        resolveOptions: plugin => ({}),
         has: () => true,
         forceExit: () => undefined,
     },

diff --git a/__tests__/unit/core-blockchain/state-machine.test.ts b/__tests__/unit/core-blockchain/state-machine.test.ts
@@ -388,24 +388,31 @@ describe("State Machine", () => {
                 await expect(() => actionMap.startForkRecovery()).toDispatch(blockchain, "SUCCESS");
 
                 expect(loggerInfo).toHaveBeenCalledWith("Starting fork recovery");
-                methodsCalled.forEach(method => {
+                for (const method of methodsCalled) {
                     expect(method).toHaveBeenCalled();
-                });
+                }
             });
         });
 
         describe("rollbackDatabase", () => {
             afterEach(() => jest.restoreAllMocks());
 
+            beforeEach(() => {
+                jest.spyOn(container.app, "resolveOptions").mockImplementation(plugin =>
+                    plugin === "blockchain"
+                        ? {
+                              databaseRollback: {
+                                  maxBlockRewind: 14,
+                                  steps: 3,
+                              },
+                          }
+                        : {},
+                );
+            });
+
             it("should try to remove X blocks based on databaseRollback config until database.verifyBlockchain() passes - and dispatch SUCCESS", async () => {
                 const loggerInfo = jest.spyOn(logger, "info");
 
-                jest.spyOn(container.app, "resolveOptions").mockReturnValue({
-                    databaseRollback: {
-                        maxBlockRewind: 14,
-                        steps: 3,
-                    },
-                });
                 // @ts-ignore
                 const removeTopBlocks = jest.spyOn(blockchain, "removeTopBlocks").mockReturnValue(true);
                 jest.spyOn(blockchain.database, "verifyBlockchain")
@@ -428,12 +435,6 @@ describe("State Machine", () => {
 
             it(`should try to remove X blocks based on databaseRollback config until database.verifyBlockchain() passes
                     and dispatch FAILURE as verifyBlockchain never passed`, async () => {
-                jest.spyOn(container.app, "resolveOptions").mockReturnValue({
-                    databaseRollback: {
-                        maxBlockRewind: 14,
-                        steps: 3,
-                    },
-                });
                 // @ts-ignore
                 const removeTopBlocks = jest.spyOn(blockchain, "removeTopBlocks").mockReturnValue(true);
                 // @ts-ignore

diff --git a/__tests__/unit/core-transaction-pool/__stubs__/connection.ts b/__tests__/unit/core-transaction-pool/__stubs__/connection.ts
@@ -98,7 +98,7 @@ export class Connection implements TransactionPool.IConnection {
         return;
     }
 
-    public hasExceededMaxTransactions(transaction: Interfaces.ITransactionData): boolean {
+    public hasExceededMaxTransactions(senderPublicKey: string): boolean {
         return true;
     }
 

diff --git a/__tests__/unit/core-transaction-pool/connection.test.ts b/__tests__/unit/core-transaction-pool/connection.test.ts
@@ -347,7 +347,7 @@ describe("Connection", () => {
             ]);
 
             expect(connection.getPoolSize()).toBe(7);
-            const exceeded = connection.hasExceededMaxTransactions(mockData.dummy3.data);
+            const exceeded = connection.hasExceededMaxTransactions(mockData.dummy3.data.senderPublicKey);
             expect(exceeded).toBeTrue();
         });
 
@@ -358,7 +358,7 @@ describe("Connection", () => {
             addTransactions([mockData.dummy4, mockData.dummy5, mockData.dummy6]);
 
             expect(connection.getPoolSize()).toBe(3);
-            const exceeded = connection.hasExceededMaxTransactions(mockData.dummy3.data);
+            const exceeded = connection.hasExceededMaxTransactions(mockData.dummy3.data.senderPublicKey);
             expect(exceeded).toBeFalse();
         });
 
@@ -377,7 +377,7 @@ describe("Connection", () => {
             ]);
 
             expect(connection.getPoolSize()).toBe(7);
-            const exceeded = connection.hasExceededMaxTransactions(mockData.dummy3.data);
+            const exceeded = connection.hasExceededMaxTransactions(mockData.dummy3.data.senderPublicKey);
             expect(exceeded).toBeFalse();
         });
     });
@@ -830,11 +830,9 @@ describe("Connection", () => {
 
             for (let i = 0; i < testSize * 2; i++) {
                 connection.getPoolSize();
-                for (const sender of ["nonexistent", mockData.dummy1.data.senderPublicKey]) {
-                    connection.getSenderSize(sender);
-                    // @FIXME: Uhm excuse me, what the?
-                    // @ts-ignore
-                    connection.hasExceededMaxTransactions(sender);
+                for (const senderPublicKey of ["nonexistent", mockData.dummy1.data.senderPublicKey]) {
+                    connection.getSenderSize(senderPublicKey);
+                    connection.hasExceededMaxTransactions(senderPublicKey);
                 }
                 connection.getTransaction(fakeTransactionId(i));
                 connection.getTransactions(0, i);

diff --git a/packages/core-blockchain/src/state-machine.ts b/packages/core-blockchain/src/state-machine.ts
@@ -291,7 +291,7 @@ blockchainMachine.actionMap = (blockchain: Blockchain) => ({
     async rollbackDatabase() {
         logger.info("Trying to restore database integrity");
 
-        const { maxBlockRewind, steps } = app.resolveOptions("p2p").databaseRollback;
+        const { maxBlockRewind, steps } = app.resolveOptions("blockchain").databaseRollback;
 
         for (let i = maxBlockRewind; i >= 0; i -= steps) {
             await blockchain.removeTopBlocks(steps);

diff --git a/packages/core-interfaces/src/core-transaction-pool/connection.ts b/packages/core-interfaces/src/core-transaction-pool/connection.ts
@@ -34,7 +34,7 @@ export interface IConnection {
     getTransactionsData<T>(start: number, size: number, property: string, maxBytes?: number): T[];
     getTransactionsForForging(blockSize: number): string[];
     has(transactionId: string): any;
-    hasExceededMaxTransactions(transaction: Interfaces.ITransactionData): boolean;
+    hasExceededMaxTransactions(senderPublicKey: string): boolean;
     isSenderBlocked(senderPublicKey: string): boolean;
     purgeByBlock(block: Interfaces.IBlock): void;
     purgeByPublicKey(senderPublicKey: string): void;

diff --git a/packages/core-transaction-pool/src/connection.ts b/packages/core-transaction-pool/src/connection.ts
@@ -197,24 +197,24 @@ export class Connection implements TransactionPool.IConnection {
     }
 
     // @TODO: move this to a more appropriate place
-    public hasExceededMaxTransactions(transaction: Interfaces.ITransactionData): boolean {
+    public hasExceededMaxTransactions(senderPublicKey: string): boolean {
         this.purgeExpired();
 
-        if (this.options.allowedSenders.includes(transaction.senderPublicKey)) {
-            if (!this.loggedAllowedSenders.includes(transaction.senderPublicKey)) {
+        if (this.options.allowedSenders.includes(senderPublicKey)) {
+            if (!this.loggedAllowedSenders.includes(senderPublicKey)) {
                 this.logger.debug(
                     `Transaction pool: allowing sender public key: ${
-                        transaction.senderPublicKey
+                        senderPublicKey
                     } (listed in options.allowedSenders), thus skipping throttling.`,
                 );
 
-                this.loggedAllowedSenders.push(transaction.senderPublicKey);
+                this.loggedAllowedSenders.push(senderPublicKey);
             }
 
             return false;
         }
 
-        return this.memory.getBySender(transaction.senderPublicKey).size >= this.options.maxTransactionsPerSender;
+        return this.memory.getBySender(senderPublicKey).size >= this.options.maxTransactionsPerSender;
     }
 
     public flush(): void {

diff --git a/packages/core-transaction-pool/src/processor.ts b/packages/core-transaction-pool/src/processor.ts
@@ -117,7 +117,7 @@ export class Processor implements TransactionPool.IProcessor {
                     "ERR_TOO_LARGE",
                     `Transaction ${transaction.id} is larger than ${maxTransactionBytes} bytes.`,
                 );
-            } else if (this.pool.hasExceededMaxTransactions(transaction)) {
+            } else if (this.pool.hasExceededMaxTransactions(transaction.senderPublicKey)) {
                 this.excess.push(transaction.id);
             } else if (this.validateTransaction(transaction)) {
                 try {
-Original file line number
+Diff line change
@@ Expand Up @@
             return;
         }
-        public hasExceededMaxTransactions(transaction: Interfaces.ITransactionData): boolean {
+        public hasExceededMaxTransactions(senderPublicKey: string): boolean {
             return true;
         }
@@ Expand Down @@