Merge pull request #17 from pnagurny/feature/ignore-p2p-txs

Ignore p2p transactions while syncing
bitpay · Jul 13, 2015 · 63b316c · 63b316c
2 parents ac3908f + a1d20df
commit 63b316c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/lib/p2p.js b/lib/p2p.js
@@ -34,8 +34,10 @@ function P2P(options) {
   this.syncTimeout = options.syncTimeout || P2P.SYNC_TIMEOUT;
   this.ready = false;
   this.synced = false;
+  this.ignoreTransactions = true; // Ignore p2p transactions while syncing
 
   this.on('synced', function() {
+    self.ignoreTransactions = false;
     self.chain.lastSavedMetadataThreshold = 0;
     self.chain.saveMetadata();
   });
@@ -98,7 +100,7 @@ P2P.prototype._onPeerInv = function(peer, message) {
 
   // check that we don't already have the data
   var filtered = inventory.filter(function(a) {
-    if (a.type === Inventory.TYPE.TX) {
+    if (a.type === Inventory.TYPE.TX && !self.ignoreTransactions) {
       return !self.mempool.hasTransaction(self._bufferToHash(a.hash));
     } else if (a.type === Inventory.TYPE.BLOCK) {
       return !self.mempool.hasBlock(self._bufferToHash(a.hash));

diff --git a/test/p2p.integration.js b/test/p2p.integration.js
@@ -99,6 +99,7 @@ describe('P2P Integration test', function() {
 
     node1 = createNode1();
     node1.on('ready', function() {
+      node1.p2p.ignoreTransactions = false;
       node1Ready = true;
       if(node2Ready) {
         done();
@@ -111,6 +112,7 @@ describe('P2P Integration test', function() {
 
     node2 = createNode2();
     node2.on('ready', function() {
+      node2.p2p.ignoreTransactions = false;
       node2Ready = true;
       if(node1Ready) {
         done();

diff --git a/test/p2p.unit.js b/test/p2p.unit.js
@@ -162,6 +162,7 @@ describe('P2P', function() {
     p2p.messages = {
       GetData: sinon.spy()
     };
+    p2p.ignoreTransactions = false;
     var peerStub = {
       sendMessage: sinon.spy()
     };