sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[tests] tidy up zmq_test.py

Browse Source
This commit is contained in:
John Newbery 2017-06-07 16:14:20 -04:00
parent 4a0c08fdcf
commit 5ebd5f9e15
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/test_runner.py
View File

@ -78,7 +78,7 @@ BASE_SCRIPTS= [
'rawtransactions.py', 'rawtransactions.py',
'reindex.py', 'reindex.py',
# vv Tests less than 30s vv # vv Tests less than 30s vv
"zmq_test.py", 'zmq_test.py',
'mempool_resurrect_test.py', 'mempool_resurrect_test.py',
'txn_doublespend.py --mineblock', 'txn_doublespend.py --mineblock',
'txn_clone.py', 'txn_clone.py',

33
test/functional/zmq_test.py
View File

@ -8,15 +8,15 @@ import os
import struct import struct
from test_framework.test_framework import BitcoinTestFramework, SkipTest from test_framework.test_framework import BitcoinTestFramework, SkipTest
from test_framework.util import * from test_framework.util import (assert_equal,
bytes_to_hex_str,
)
class ZMQTest (BitcoinTestFramework): class ZMQTest (BitcoinTestFramework):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.num_nodes = 4 self.num_nodes = 2
port = 28332
def setup_nodes(self): def setup_nodes(self):
# Try to import python3-zmq. Skip this test if the import fails. # Try to import python3-zmq. Skip this test if the import fails.
@ -38,21 +38,16 @@ class ZMQTest (BitcoinTestFramework):
self.zmqSubSocket = self.zmqContext.socket(zmq.SUB) self.zmqSubSocket = self.zmqContext.socket(zmq.SUB)
self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashblock") self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashblock")
self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtx") self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, b"hashtx")
self.zmqSubSocket.connect("tcp://127.0.0.1:%i" % self.port) ip_address = "tcp://127.0.0.1:28332"
self.nodes = self.start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[ self.zmqSubSocket.connect(ip_address)
['-zmqpubhashtx=tcp://127.0.0.1:'+str(self.port), '-zmqpubhashblock=tcp://127.0.0.1:'+str(self.port)], extra_args = [['-zmqpubhashtx=%s' % ip_address, '-zmqpubhashblock=%s' % ip_address], []]
[], self.nodes = self.start_nodes(self.num_nodes, self.options.tmpdir, extra_args)
[],
[]
])
def run_test(self): def run_test(self):
self.sync_all()
genhashes = self.nodes[0].generate(1) genhashes = self.nodes[0].generate(1)
self.sync_all() self.sync_all()
self.log.info("listen...") self.log.info("Wait for tx")
msg = self.zmqSubSocket.recv_multipart() msg = self.zmqSubSocket.recv_multipart()
topic = msg[0] topic = msg[0]
assert_equal(topic, b"hashtx") assert_equal(topic, b"hashtx")
@ -60,6 +55,7 @@ class ZMQTest (BitcoinTestFramework):
msgSequence = struct.unpack('<I', msg[-1])[-1] msgSequence = struct.unpack('<I', msg[-1])[-1]
assert_equal(msgSequence, 0) # must be sequence 0 on hashtx assert_equal(msgSequence, 0) # must be sequence 0 on hashtx
self.log.info("Wait for block")
msg = self.zmqSubSocket.recv_multipart() msg = self.zmqSubSocket.recv_multipart()
topic = msg[0] topic = msg[0]
body = msg[1] body = msg[1]
@ -69,13 +65,14 @@ class ZMQTest (BitcoinTestFramework):
assert_equal(genhashes[0], blkhash) # blockhash from generate must be equal to the hash received over zmq assert_equal(genhashes[0], blkhash) # blockhash from generate must be equal to the hash received over zmq
self.log.info("Generate 10 blocks (and 10 coinbase txes)")
n = 10 n = 10
genhashes = self.nodes[1].generate(n) genhashes = self.nodes[1].generate(n)
self.sync_all() self.sync_all()
zmqHashes = [] zmqHashes = []
blockcount = 0 blockcount = 0
for x in range(0,n*2): for x in range(n * 2):
msg = self.zmqSubSocket.recv_multipart() msg = self.zmqSubSocket.recv_multipart()
topic = msg[0] topic = msg[0]
body = msg[1] body = msg[1]
@ -85,9 +82,10 @@ class ZMQTest (BitcoinTestFramework):
assert_equal(msgSequence, blockcount + 1) assert_equal(msgSequence, blockcount + 1)
blockcount += 1 blockcount += 1
for x in range(0,n): for x in range(n):
assert_equal(genhashes[x], zmqHashes[x]) # blockhash from generate must be equal to the hash received over zmq assert_equal(genhashes[x], zmqHashes[x]) # blockhash from generate must be equal to the hash received over zmq
self.log.info("Wait for tx from second node")
# test tx from a second node # test tx from a second node
hashRPC = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.0) hashRPC = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.0)
self.sync_all() self.sync_all()
@ -102,8 +100,7 @@ class ZMQTest (BitcoinTestFramework):
msgSequence = struct.unpack('<I', msg[-1])[-1] msgSequence = struct.unpack('<I', msg[-1])[-1]
assert_equal(msgSequence, blockcount + 1) assert_equal(msgSequence, blockcount + 1)
assert_equal(hashRPC, hashZMQ) #blockhash from generate must be equal to the hash received over zmq assert_equal(hashRPC, hashZMQ) # txid from sendtoaddress must be equal to the hash received over zmq
if __name__ == '__main__': if __name__ == '__main__':
ZMQTest().main() ZMQTest().main()