mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge #20022: test: use explicit p2p objects where available
0fcaf731997c4989b869e42d8990f742637799c2 test: use explicit p2p objects where available (Oliver Gugger) Pull request description: This is a follow-up patch to #19804 as suggested by MarcoFalke (https://github.com/bitcoin/bitcoin/pull/19804#discussion_r494950062). To make the intent of the tests easier to understand, we reference the p2p connection objects by their explicit names instead of the p2ps array. ACKs for top commit: theStack: ACK 0fcaf731997c4989b869e42d8990f742637799c2 Tree-SHA512: 37db22185077beeadfa7245bb768b87d6b7a2cfb906c3c859ab92ec3d657122db7301777f0838e13dfc748f37303850144fb7553e6cb6c66903e304d6e10e659
This commit is contained in:
parent
40420195be
commit
2b941e594b
@ -42,7 +42,7 @@ class GetdataTest(BitcoinTestFramework):
|
|||||||
good_getdata = msg_getdata()
|
good_getdata = msg_getdata()
|
||||||
good_getdata.inv.append(CInv(t=2, h=best_block))
|
good_getdata.inv.append(CInv(t=2, h=best_block))
|
||||||
p2p_block_store.send_and_ping(good_getdata)
|
p2p_block_store.send_and_ping(good_getdata)
|
||||||
p2p_block_store.wait_until(lambda: self.nodes[0].p2ps[0].blocks[best_block] == 1)
|
p2p_block_store.wait_until(lambda: p2p_block_store.blocks[best_block] == 1)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
@ -62,7 +62,7 @@ class ResendWalletTransactionsTest(BitcoinTestFramework):
|
|||||||
node.setmocktime(self.mocktime + twelve_hrs - two_min)
|
node.setmocktime(self.mocktime + twelve_hrs - two_min)
|
||||||
self.mocktime = self.mocktime + twelve_hrs - two_min
|
self.mocktime = self.mocktime + twelve_hrs - two_min
|
||||||
time.sleep(2) # ensure enough time has passed for rebroadcast attempt to occur
|
time.sleep(2) # ensure enough time has passed for rebroadcast attempt to occur
|
||||||
assert_equal(int(txid, 16) in node.p2ps[1].get_invs(), False)
|
assert_equal(int(txid, 16) in peer_second.get_invs(), False)
|
||||||
|
|
||||||
self.log.info("Bump time & check that transaction is rebroadcast")
|
self.log.info("Bump time & check that transaction is rebroadcast")
|
||||||
# Transaction should be rebroadcast approximately 2 hours in the future,
|
# Transaction should be rebroadcast approximately 2 hours in the future,
|
||||||
|
Loading…
Reference in New Issue
Block a user