Skip to content

Commit 3858aab

Browse files
committed
[tests] Remove support for p2p alert messages
Alert messages were removed in p2p version 70013 (Bitcoin Core V0.13.0)
1 parent c0b1274 commit 3858aab

File tree

2 files changed

+0
-97
lines changed

2 files changed

+0
-97
lines changed

test/functional/p2p-leaktests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ def on_verack(self, conn, message): self.bad_message(message)
3939
def on_reject(self, conn, message): self.bad_message(message)
4040
def on_inv(self, conn, message): self.bad_message(message)
4141
def on_addr(self, conn, message): self.bad_message(message)
42-
def on_alert(self, conn, message): self.bad_message(message)
4342
def on_getdata(self, conn, message): self.bad_message(message)
4443
def on_getblocks(self, conn, message): self.bad_message(message)
4544
def on_tx(self, conn, message): self.bad_message(message)

test/functional/test_framework/mininode.py

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -665,81 +665,6 @@ def __repr__(self):
665665
time.ctime(self.nTime), self.nBits, self.nNonce, repr(self.vtx))
666666

667667

668-
class CUnsignedAlert():
669-
def __init__(self):
670-
self.nVersion = 1
671-
self.nRelayUntil = 0
672-
self.nExpiration = 0
673-
self.nID = 0
674-
self.nCancel = 0
675-
self.setCancel = []
676-
self.nMinVer = 0
677-
self.nMaxVer = 0
678-
self.setSubVer = []
679-
self.nPriority = 0
680-
self.strComment = b""
681-
self.strStatusBar = b""
682-
self.strReserved = b""
683-
684-
def deserialize(self, f):
685-
self.nVersion = struct.unpack("<i", f.read(4))[0]
686-
self.nRelayUntil = struct.unpack("<q", f.read(8))[0]
687-
self.nExpiration = struct.unpack("<q", f.read(8))[0]
688-
self.nID = struct.unpack("<i", f.read(4))[0]
689-
self.nCancel = struct.unpack("<i", f.read(4))[0]
690-
self.setCancel = deser_int_vector(f)
691-
self.nMinVer = struct.unpack("<i", f.read(4))[0]
692-
self.nMaxVer = struct.unpack("<i", f.read(4))[0]
693-
self.setSubVer = deser_string_vector(f)
694-
self.nPriority = struct.unpack("<i", f.read(4))[0]
695-
self.strComment = deser_string(f)
696-
self.strStatusBar = deser_string(f)
697-
self.strReserved = deser_string(f)
698-
699-
def serialize(self):
700-
r = b""
701-
r += struct.pack("<i", self.nVersion)
702-
r += struct.pack("<q", self.nRelayUntil)
703-
r += struct.pack("<q", self.nExpiration)
704-
r += struct.pack("<i", self.nID)
705-
r += struct.pack("<i", self.nCancel)
706-
r += ser_int_vector(self.setCancel)
707-
r += struct.pack("<i", self.nMinVer)
708-
r += struct.pack("<i", self.nMaxVer)
709-
r += ser_string_vector(self.setSubVer)
710-
r += struct.pack("<i", self.nPriority)
711-
r += ser_string(self.strComment)
712-
r += ser_string(self.strStatusBar)
713-
r += ser_string(self.strReserved)
714-
return r
715-
716-
def __repr__(self):
717-
return "CUnsignedAlert(nVersion %d, nRelayUntil %d, nExpiration %d, nID %d, nCancel %d, nMinVer %d, nMaxVer %d, nPriority %d, strComment %s, strStatusBar %s, strReserved %s)" \
718-
% (self.nVersion, self.nRelayUntil, self.nExpiration, self.nID,
719-
self.nCancel, self.nMinVer, self.nMaxVer, self.nPriority,
720-
self.strComment, self.strStatusBar, self.strReserved)
721-
722-
723-
class CAlert():
724-
def __init__(self):
725-
self.vchMsg = b""
726-
self.vchSig = b""
727-
728-
def deserialize(self, f):
729-
self.vchMsg = deser_string(f)
730-
self.vchSig = deser_string(f)
731-
732-
def serialize(self):
733-
r = b""
734-
r += ser_string(self.vchMsg)
735-
r += ser_string(self.vchSig)
736-
return r
737-
738-
def __repr__(self):
739-
return "CAlert(vchMsg.sz %d, vchSig.sz %d)" \
740-
% (len(self.vchMsg), len(self.vchSig))
741-
742-
743668
class PrefilledTransaction():
744669
def __init__(self, index=0, tx = None):
745670
self.index = index
@@ -1043,25 +968,6 @@ def __repr__(self):
1043968
return "msg_addr(addrs=%s)" % (repr(self.addrs))
1044969

1045970

1046-
class msg_alert():
1047-
command = b"alert"
1048-
1049-
def __init__(self):
1050-
self.alert = CAlert()
1051-
1052-
def deserialize(self, f):
1053-
self.alert = CAlert()
1054-
self.alert.deserialize(f)
1055-
1056-
def serialize(self):
1057-
r = b""
1058-
r += self.alert.serialize()
1059-
return r
1060-
1061-
def __repr__(self):
1062-
return "msg_alert(alert=%s)" % (repr(self.alert), )
1063-
1064-
1065971
class msg_inv():
1066972
command = b"inv"
1067973

@@ -1484,7 +1390,6 @@ def on_close(self, conn):
14841390
self.connection = None
14851391

14861392
def on_addr(self, conn, message): pass
1487-
def on_alert(self, conn, message): pass
14881393
def on_block(self, conn, message): pass
14891394
def on_blocktxn(self, conn, message): pass
14901395
def on_cmpctblock(self, conn, message): pass
@@ -1588,7 +1493,6 @@ class NodeConn(asyncore.dispatcher):
15881493
b"version": msg_version,
15891494
b"verack": msg_verack,
15901495
b"addr": msg_addr,
1591-
b"alert": msg_alert,
15921496
b"inv": msg_inv,
15931497
b"getdata": msg_getdata,
15941498
b"getblocks": msg_getblocks,

0 commit comments

Comments
 (0)