zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check entire contents of mempool

This commit is contained in:
Eirik Ogilvie-Wigley 2019-01-14 14:29:39 -07:00
parent 57dcc9e6bf
commit 3dab742638
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qa/rpc-tests/p2p_txexpiringsoon.py
View File

@ -9,8 +9,8 @@ from test_framework.authproxy import JSONRPCException
from test_framework.mininode import NodeConn, NetworkThread, CInv, \ from test_framework.mininode import NodeConn, NetworkThread, CInv, \
msg_mempool, msg_getdata, msg_tx, mininode_lock, OVERWINTER_PROTO_VERSION msg_mempool, msg_getdata, msg_tx, mininode_lock, OVERWINTER_PROTO_VERSION
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import initialize_chain_clean, start_nodes, \ from test_framework.util import assert_equal, connect_nodes_bi, fail, \
p2p_port, assert_equal, sync_blocks, sync_mempools, connect_nodes_bi initialize_chain_clean, p2p_port, start_nodes, sync_blocks, sync_mempools
from tx_expiry_helper import TestNode, create_transaction from tx_expiry_helper import TestNode, create_transaction
from binascii import hexlify from binascii import hexlify
@ -82,11 +82,10 @@ class TxExpiringSoonTest(BitcoinTestFramework):
sync_mempools(self.nodes[:2]) sync_mempools(self.nodes[:2])
# Verify contents of mempool # Verify contents of mempool
assert(tx1.hash not in self.nodes[0].getrawmempool()) # tx1 rejected as expiring soon # tx1 rejected as expiring soon, tx2 accepted, node 2 isolated
assert(tx1.hash not in self.nodes[1].getrawmempool()) assert_equal([tx2.hash], self.nodes[0].getrawmempool())
assert(tx2.hash in self.nodes[0].getrawmempool()) # tx2 accepted assert_equal([tx2.hash], self.nodes[1].getrawmempool())
assert(tx2.hash in self.nodes[1].getrawmempool()) assert_equal([], self.nodes[2].getrawmempool())
assert_equal(len(self.nodes[2].getrawmempool()), 0) # node 2 is isolated and empty
# Send p2p message "mempool" to receive contents from zcashd node in "inv" message # Send p2p message "mempool" to receive contents from zcashd node in "inv" message
with mininode_lock: with mininode_lock:
@ -145,18 +144,20 @@ class TxExpiringSoonTest(BitcoinTestFramework):
assert_equal(self.nodes[2].getblockcount(), 201) assert_equal(self.nodes[2].getblockcount(), 201)
# Verify contents of mempool # Verify contents of mempool
assert(tx2.hash in self.nodes[0].getrawmempool()) assert_equal([tx2.hash], self.nodes[0].getrawmempool())
assert(tx2.hash in self.nodes[1].getrawmempool()) assert_equal([tx2.hash], self.nodes[1].getrawmempool())
assert(tx2.hash not in self.nodes[2].getrawmempool()) assert_equal([], self.nodes[2].getrawmempool())
# Confirm tx2 cannot be submitted to a mempool because it is expiring soon. # Confirm tx2 cannot be submitted to a mempool because it is expiring soon.
try: try:
rawtx2 = hexlify(tx2.serialize()) rawtx2 = hexlify(tx2.serialize())
self.nodes[2].sendrawtransaction(rawtx2) self.nodes[2].sendrawtransaction(rawtx2)
assert(False) fail("Sending transaction should have failed")
except JSONRPCException as e: except JSONRPCException as e:
errorString = e.error['message'] assert_equal(
assert("tx-expiring-soon" in errorString) "tx-expiring-soon: expiryheight is 204 but should be at least 205 to avoid transaction expiring soon",
e.error['message']
)
# Ask node 0 for tx2... # Ask node 0 for tx2...
with mininode_lock: with mininode_lock: