Add fill_askfor test again and fix hash

Author: Duddino

test/functional/p2p_invalid_messages.py

@@ -8,15 +8,18 @@
 import time
 
 from test_framework import messages
+from test_framework.messages import CTxIn, COutPoint, msg_mnping
 from test_framework.mininode import (
     P2PDataStore,
     P2PInterface,
 )
 from test_framework.test_framework import PivxTestFramework
 from test_framework.util import (
+    assert_equal,
     hex_str_to_bytes,
     wait_until,
 )
+from random import getrandbits
 
 MSG_LIMIT = 2 * 1024 * 1024  # 2MB, per MAX_PROTOCOL_MESSAGE_LENGTH
 VALID_DATA_LIMIT = MSG_LIMIT - 5  # Account for the 5-byte length prefix
@@ -52,7 +55,6 @@ def on_getdata(self, message):
             if inv.type == 15: # MNPING
                 self.send_message(self.vec_mnp[inv.hash])
                 self.getdata_count+=1
-                print(self.getdata_count)
 
     def wait_for_p2p_messages(self, n_messages):
         wait_until(lambda: self.getdata_count == n_messages, timeout=60)
@@ -74,6 +76,7 @@ def run_test(self):
         self.test_addrv2_unrecognized_network()
         self.test_large_inv()
         self.test_resource_exhaustion()
+        self.test_fill_askfor()
 
     def test_magic_bytes(self):
         conn = self.nodes[0].add_p2p_connection(P2PDataStore())
@@ -206,6 +209,31 @@ def test_large_inv(self):
             conn.send_and_ping(msg)
         self.nodes[0].disconnect_p2ps()
 
+    def test_fill_askfor(self):
+        self.nodes[0].generate(1) # IBD
+        conn = self.nodes[0].add_p2p_connection(InvReceiver())
+        self.disable_mocktime()
+        invs = []
+        blockhash = int(self.nodes[0].getbestblockhash(), 16)
+        total_requests = 100
+        for _ in range(total_requests):
+            mnp = msg_mnping(CTxIn(COutPoint(getrandbits(256))), blockhash, int(time.time()))
+            hash = mnp.get_hash()
+            conn.vec_mnp[hash] = mnp
+            invs.append(messages.CInv(15, hash))
+        assert_equal(len(conn.vec_mnp), total_requests)
+        assert_equal(len(invs), total_requests)
+        msg = messages.msg_inv(invs)
+        conn.send_message(msg)
+        conn.wait_for_p2p_messages(total_requests)
+        # Prior #2611 the node was blocking any follow-up request.
+        mnp = msg_mnping(CTxIn(COutPoint(getrandbits(256))), getrandbits(256), int(time.time()))
+        conn.vec_mnp[mnp.get_hash()] = mnp
+        msg = messages.msg_inv([messages.CInv(15, mnp.get_hash())])
+        conn.send_and_ping(msg)
+        conn.wait_for_p2p_messages(total_requests + 1)
+        self.nodes[0].disconnect_p2ps()
+        
     def test_resource_exhaustion(self):
         conn = self.nodes[0].add_p2p_connection(P2PDataStore())
         conn2 = self.nodes[0].add_p2p_connection(P2PDataStore())

test/functional/test_framework/messages.py

@@ -1246,10 +1246,16 @@ def serialize(self):
         r += ser_string(self.vch_sig)
         r += struct.pack("<I", self.mess_version)
         return r
+    def serialize_for_hash(self):
+        r = b""
+        r += self.vin.serialize()
+        r += ser_uint256(self.blockhash)
+        r += struct.pack("<q", self.sigtime)
+        return r
 
     def get_hash(self):
         if self.cached_hash == b"":
-            self.cached_hash = uint256_from_str(hash256(self.serialize()))
+            self.cached_hash = uint256_from_str(hash256(self.serialize_for_hash()))
         return self.cached_hash
 
     def __repr__(self):