Merge #20028: test: Check that invalid peer traffic is accounted for

faa94cb test: Check that invalid peer traffic is accounted for (MarcoFalke)
fae243f test: Remove confusing cast to same type (int to int) (MarcoFalke)

Pull request description:

  Couldn't find a test for this and it seems something we should test, so I wrote one.

ACKs for top commit:
  vasild:
    ACK faa94cb
  practicalswift:
    ACK faa94cb: patch looks correct

Tree-SHA512: efcdd35960045cdfbd14480e16e0d1d09e81eb01670ac541ac2b105e1a63818a157c95853270242234a224880873e79957832bf4231374d7fe81de30f35e3abf

Author: fanquake

test/functional/p2p_invalid_messages.py

@@ -22,12 +22,11 @@
     P2PInterface,
 )
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import (
-    assert_equal,
-)
+from test_framework.util import assert_equal
 
 VALID_DATA_LIMIT = MAX_PROTOCOL_MESSAGE_LENGTH - 5  # Account for the 5-byte length prefix
 
+
 class msg_unrecognized:
     """Nonsensical message. Modeled after similar types in test_framework.messages."""
 
@@ -64,13 +63,13 @@ def test_buffer(self):
         conn = self.nodes[0].add_p2p_connection(P2PDataStore())
         # Create valid message
         msg = conn.build_message(msg_ping(nonce=12345))
-        cut_pos = 12    # Chosen at an arbitrary position within the header
+        cut_pos = 12  # Chosen at an arbitrary position within the header
         # Send message in two pieces
-        before = int(self.nodes[0].getnettotals()['totalbytesrecv'])
+        before = self.nodes[0].getnettotals()['totalbytesrecv']
         conn.send_raw_message(msg[:cut_pos])
         # Wait until node has processed the first half of the message
-        self.wait_until(lambda: int(self.nodes[0].getnettotals()['totalbytesrecv']) != before)
-        middle = int(self.nodes[0].getnettotals()['totalbytesrecv'])
+        self.wait_until(lambda: self.nodes[0].getnettotals()['totalbytesrecv'] != before)
+        middle = self.nodes[0].getnettotals()['totalbytesrecv']
         # If this assert fails, we've hit an unlikely race
         # where the test framework sent a message in between the two halves
         assert_equal(middle, before + cut_pos)
@@ -100,6 +99,8 @@ def test_checksum(self):
             msg = msg[:cut_len] + b'\xff' * 4 + msg[cut_len + 4:]
             conn.send_raw_message(msg)
             conn.sync_with_ping(timeout=1)
+        # Check that traffic is accounted for (24 bytes header + 2 bytes payload)
+        assert_equal(self.nodes[0].getpeerinfo()[0]['bytesrecv_per_msg']['*other*'], 26)
         self.nodes[0].disconnect_p2ps()
 
     def test_size(self):
@@ -123,6 +124,8 @@ def test_msgtype(self):
             msg = msg[:7] + b'\x00' + msg[7 + 1:]
             conn.send_raw_message(msg)
             conn.sync_with_ping(timeout=1)
+        # Check that traffic is accounted for (24 bytes header + 2 bytes payload)
+        assert_equal(self.nodes[0].getpeerinfo()[0]['bytesrecv_per_msg']['*other*'], 26)
         self.nodes[0].disconnect_p2ps()
 
     def test_oversized_msg(self, msg, size):