From: Forrest Voight <forrest@forre.st>
Date: Thu, 27 Jun 2013 21:04:42 +0000 (-0400)
Subject: removed now-unnecessary version checks in p2p
X-Git-Tag: 13.0~13
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=20af2dfe5046857b3e41d074cdde1af52d55f734

removed now-unnecessary version checks in p2p
---

diff --git a/p2pool/p2p.py b/p2pool/p2p.py
index 197f97e..3a7cb5f 100644
--- a/p2pool/p2p.py
+++ b/p2pool/p2p.py
@@ -157,9 +157,6 @@ class Protocol(p2protocol.Protocol):
         if best_share_hash is not None:
             self.node.handle_share_hashes([best_share_hash], self)
         
-        if self.other_version < 8:
-            return
-        
         def update_remote_view_of_my_known_txs(before, after):
             added = set(after) - set(before)
             removed = set(before) - set(after)
@@ -258,29 +255,27 @@ class Protocol(p2protocol.Protocol):
         self.node.handle_shares([p2pool_data.load_share(share, self.node.net, self.addr) for share in shares if share['type'] >= 9], self)
     
     def sendShares(self, shares, tracker, known_txs, include_txs_with=[]):
-        if self.other_version >= 8:
-            tx_hashes = set()
-            for share in shares:
-                if share.hash in include_txs_with:
-                    x = share.get_other_tx_hashes(tracker)
-                    if x is not None:
-                        tx_hashes.update(x)
-            
-            hashes_to_send = [x for x in tx_hashes if x not in self.node.mining_txs_var.value and x in known_txs]
-            
-            new_remote_remembered_txs_size = self.remote_remembered_txs_size + sum(100 + bitcoin_data.tx_type.packed_size(known_txs[x]) for x in hashes_to_send)
-            if new_remote_remembered_txs_size > self.max_remembered_txs_size:
-                raise ValueError('shares have too many txs')
-            self.remote_remembered_txs_size = new_remote_remembered_txs_size
-            
-            fragment(self.send_remember_tx, tx_hashes=[x for x in hashes_to_send if x in self.remote_tx_hashes], txs=[known_txs[x] for x in hashes_to_send if x not in self.remote_tx_hashes])
+        tx_hashes = set()
+        for share in shares:
+            if share.hash in include_txs_with:
+                x = share.get_other_tx_hashes(tracker)
+                if x is not None:
+                    tx_hashes.update(x)
+        
+        hashes_to_send = [x for x in tx_hashes if x not in self.node.mining_txs_var.value and x in known_txs]
+        
+        new_remote_remembered_txs_size = self.remote_remembered_txs_size + sum(100 + bitcoin_data.tx_type.packed_size(known_txs[x]) for x in hashes_to_send)
+        if new_remote_remembered_txs_size > self.max_remembered_txs_size:
+            raise ValueError('shares have too many txs')
+        self.remote_remembered_txs_size = new_remote_remembered_txs_size
+        
+        fragment(self.send_remember_tx, tx_hashes=[x for x in hashes_to_send if x in self.remote_tx_hashes], txs=[known_txs[x] for x in hashes_to_send if x not in self.remote_tx_hashes])
         
         fragment(self.send_shares, shares=[share.as_share() for share in shares])
         
-        if self.other_version >= 8:
-            self.send_forget_tx(tx_hashes=hashes_to_send)
-            
-            self.remote_remembered_txs_size -= sum(100 + bitcoin_data.tx_type.packed_size(known_txs[x]) for x in hashes_to_send)
+        self.send_forget_tx(tx_hashes=hashes_to_send)
+        
+        self.remote_remembered_txs_size -= sum(100 + bitcoin_data.tx_type.packed_size(known_txs[x]) for x in hashes_to_send)
     
     
     message_sharereq = pack.ComposedType([