Merge branch 'development' into testnet

RiseVision · Sep 19, 2018 · 29726d2 · 29726d2
2 parents d8a328b + c47e5f0
commit 29726d2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/apis/transportv2API.ts b/src/apis/transportv2API.ts
@@ -221,10 +221,7 @@ export class TransportV2API {
       where: { id: lastBlockId },
     });
     if (lastBlock != null) {
-      // TODO: We limit the number of blocks to return to not overload this node.
-      // We might implement a way to avoid spamming nodes by using some kind of PoW upon requesting the block. or by limiting this
-      // endpoint on the IP requesting the resource.
-      const blocksToLoad = Math.ceil(Math.min(500, (await this.calcNumBlocksToLoad(lastBlock)) * 0.5));
+      const blocksToLoad = await this.calcNumBlocksToLoad(lastBlock);
       const dbBlocks = await this.blocksModuleUtils.loadBlocksData({
         lastId: lastBlockId,
         limit: blocksToLoad,

diff --git a/src/helpers/constants.ts b/src/helpers/constants.ts
@@ -76,7 +76,7 @@ export default {
   maxConfirmations             : 77 * 100,
   maxPayloadLength             : 1024 * 1024,
   maxPeers                     : 100,
-  maxProtoBufPayloadLength     : 1572864, // (1.5MB) Maximum number of bytes for a Protocol Buffer Request/Response Body
+  maxProtoBufPayloadLength     : 100 * 1024, // (100KB) Maximum number of bytes for a Protocol Buffer Request/Response Body
   maxRequests                  : 10000 * 12,
   maxSharedTxs                 : 100,
   maxSignaturesLength          : 196 * 256,

diff --git a/tests/unit/apis/transportV2API.spec.ts b/tests/unit/apis/transportV2API.spec.ts
@@ -584,21 +584,21 @@ describe('apis/transportV2API', () => {
       });
     });
 
-    it('should call loadBlocksData with limit 500 ', async () => {
+    it('should call loadBlocksData with limit 2100 ', async () => {
       await instance.getBlocks('123');
       expect(blocksSubmoduleUtilsStub.stubs.loadBlocksData.calledOnce).to.be.true;
       expect(blocksSubmoduleUtilsStub.stubs.loadBlocksData.firstCall.args).to.be.deep.equal([{
         lastId: '123',
-        limit : 500,
+        limit : 2100,
       }]);
     });
-    it('should call loadBlocksData with limit 400 ', async () => {
+    it('should call loadBlocksData with limit 800 ', async () => {
       numblocksToLoadStub.resolves(800);
       await instance.getBlocks('123');
       expect(blocksSubmoduleUtilsStub.stubs.loadBlocksData.calledOnce).to.be.true;
       expect(blocksSubmoduleUtilsStub.stubs.loadBlocksData.firstCall.args).to.be.deep.equal([{
         lastId: '123',
-        limit : 400,
+        limit : 800,
       }]);
     });
 

diff --git a/tests/unit/logic/peers.spec.ts b/tests/unit/logic/peers.spec.ts
@@ -352,13 +352,13 @@ describe('logic/peers', () => {
 
     it('should return true if removal was less than 15 minutes ago', () => {
       (instance as any).lastRemoved = {};
-      (instance as any).lastRemoved[peerLogicStub.string] = Date.now() - config.peers.banTime + 1;
+      (instance as any).lastRemoved[peerLogicStub.string] = Date.now() - config.peers.banTime + 1000;
       expect((instance as any).wasRecentlyRemoved(peerLogicStub)).to.be.true;
     });
 
     it('should return false if removal was more than 15 minutes ago', () => {
       (instance as any).lastRemoved = {};
-      (instance as any).lastRemoved[peerLogicStub.string] = Date.now() - config.peers.banTime - 1;
+      (instance as any).lastRemoved[peerLogicStub.string] = Date.now() - config.peers.banTime - 1000;
       expect((instance as any).wasRecentlyRemoved(peerLogicStub)).to.be.false;
     });
   });