|
37 | 37 | from test_framework.siphash import siphash256
|
38 | 38 | from test_framework.util import hex_str_to_bytes, bytes_to_hex_str, wait_until
|
39 | 39 |
|
40 |
| -BIP0031_VERSION = 60000 |
41 | 40 | MY_VERSION = 70014 # past bip-31 for ping/pong
|
42 | 41 | MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"
|
43 | 42 | MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37)
|
@@ -1195,22 +1194,6 @@ def __repr__(self):
|
1195 | 1194 | return "msg_getaddr()"
|
1196 | 1195 |
|
1197 | 1196 |
|
1198 |
| -class msg_ping_prebip31(): |
1199 |
| - command = b"ping" |
1200 |
| - |
1201 |
| - def __init__(self): |
1202 |
| - pass |
1203 |
| - |
1204 |
| - def deserialize(self, f): |
1205 |
| - pass |
1206 |
| - |
1207 |
| - def serialize(self): |
1208 |
| - return b"" |
1209 |
| - |
1210 |
| - def __repr__(self): |
1211 |
| - return "msg_ping() (pre-bip31)" |
1212 |
| - |
1213 |
| - |
1214 | 1197 | class msg_ping():
|
1215 | 1198 | command = b"ping"
|
1216 | 1199 |
|
@@ -1528,8 +1511,7 @@ def on_inv(self, conn, message):
|
1528 | 1511 | conn.send_message(want)
|
1529 | 1512 |
|
1530 | 1513 | def on_ping(self, conn, message):
|
1531 |
| - if conn.ver_send > BIP0031_VERSION: |
1532 |
| - conn.send_message(msg_pong(message.nonce)) |
| 1514 | + conn.send_message(msg_pong(message.nonce)) |
1533 | 1515 |
|
1534 | 1516 | def on_verack(self, conn, message):
|
1535 | 1517 | conn.ver_recv = conn.ver_send
|
@@ -1786,9 +1768,6 @@ def send_message(self, message, pushbuf=False):
|
1786 | 1768 | self.last_sent = time.time()
|
1787 | 1769 |
|
1788 | 1770 | def got_message(self, message):
|
1789 |
| - if message.command == b"version": |
1790 |
| - if message.nVersion <= BIP0031_VERSION: |
1791 |
| - self.messagemap[b'ping'] = msg_ping_prebip31 |
1792 | 1771 | if self.last_sent + 30 * 60 < time.time():
|
1793 | 1772 | self.send_message(self.messagemap[b'ping']())
|
1794 | 1773 | self._log_message("receive", message)
|
|
0 commit comments