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

test: Implement CInv.__eq__() for mininode to simplify RPC test

This commit is contained in:
Jack Grigg 2021-09-10 21:54:52 +01:00
parent fc8726e6a4
commit a97cfd241d
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qa/rpc-tests/feature_zip239.py
View File

@ -70,10 +70,7 @@ class Zip239Test(BitcoinTestFramework):
actual_invs = sorted(msg.inv, key=lambda inv: (inv.type, inv.hash, inv.hash_aux))
for (expected, actual) in zip(expected_invs, actual_invs):
fail_msg = "%r != %r" % (actual, expected)
assert_equal(actual.type, expected.type, fail_msg)
assert_equal(actual.hash, expected.hash, fail_msg)
assert_equal(actual.hash_aux, expected.hash_aux, fail_msg)
assert_equal(expected, actual)
def send_data_message(self, testnode, txid, authDigest=None):
# Send p2p message "getdata" to verify tx gets sent in "tx" message
@ -105,12 +102,7 @@ class Zip239Test(BitcoinTestFramework):
assert_true(testnode.last_tx is None, "'%r' is not None" % testnode.last_tx)
assert_false(testnode.last_notfound is None, "notfound not received")
assert_equal(len(testnode.last_notfound.inv), 1)
actual = testnode.last_notfound.inv[0]
expected = self.cinv_for(txid, authDigest)
fail_msg = "%r != %r" % (actual, expected)
assert_equal(actual.type, expected.type, fail_msg)
assert_equal(actual.hash, expected.hash, fail_msg)
assert_equal(actual.hash_aux, expected.hash_aux, fail_msg)
assert_equal(testnode.last_notfound.inv[0], self.cinv_for(txid, authDigest))
def verify_disconnected(self, testnode, timeout=30):
sleep_time = 0.05

6
qa/rpc-tests/test_framework/mininode.py
View File

@ -363,6 +363,12 @@ class CInv(object):
r += ser_uint256(self.hash_aux)
return r
def __eq__(self, other):
return (
(type(self) == type(other)) and
(self.type, self.hash, self.hash_aux) == (other.type, other.hash, other.hash_aux)
)
def __repr__(self):
return "CInv(type=%s hash=%064x hash_aux=%064x)" \
% (self.typemap[self.type], self.hash, self.hash_aux)