neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update p2p-autoinstantsend.py to test both "old" and "new" InstantSend

Browse Source
This commit is contained in:
UdjinM6 2019-03-03 13:30:34 +03:00 committed by Alexander Block
parent a8da11ac5d
commit 843b6d7a95
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
qa/rpc-tests/p2p-autoinstantsend.py
View File

@ -89,13 +89,14 @@ class AutoInstantSendTest(DashTestFramework):
self.nodes[0].spork('SPORK_16_INSTANTSEND_AUTOLOCKS', value) self.nodes[0].spork('SPORK_16_INSTANTSEND_AUTOLOCKS', value)
# sends regular IX with high fee and may inputs (not-simple transaction) # sends regular IX with high fee and may inputs (not-simple transaction)
def send_regular_IX(self): def send_regular_IX(self, check_fee = True):
receiver_addr = self.nodes[self.receiver_idx].getnewaddress() receiver_addr = self.nodes[self.receiver_idx].getnewaddress()
txid = self.nodes[0].instantsendtoaddress(receiver_addr, 1.0) txid = self.nodes[0].instantsendtoaddress(receiver_addr, 1.0)
MIN_FEE = satoshi_round(-0.0001) if (check_fee):
fee = self.nodes[0].gettransaction(txid)['fee'] MIN_FEE = satoshi_round(-0.0001)
expected_fee = MIN_FEE * len(self.nodes[0].getrawtransaction(txid, True)['vin']) fee = self.nodes[0].gettransaction(txid)['fee']
assert_equal(fee, expected_fee) expected_fee = MIN_FEE * len(self.nodes[0].getrawtransaction(txid, True)['vin'])
assert_equal(fee, expected_fee)
return self.wait_for_instantlock(txid, self.nodes[0]) return self.wait_for_instantlock(txid, self.nodes[0])
# sends simple trx, it should become IX if autolocks are allowed # sends simple trx, it should become IX if autolocks are allowed
@ -115,6 +116,21 @@ class AutoInstantSendTest(DashTestFramework):
def run_test(self): def run_test(self):
# make sure masternodes are synced # make sure masternodes are synced
sync_masternodes(self.nodes) sync_masternodes(self.nodes)
self.nodes[0].spork("SPORK_17_QUORUM_DKG_ENABLED", 0)
self.wait_for_sporks_same()
self.mine_quorum()
print("Test old InstantSend")
self.test_auto();
self.nodes[0].spork("SPORK_2_INSTANTSEND_ENABLED", 1)
self.wait_for_sporks_same()
print("Test new InstantSend")
self.test_auto(True);
def test_auto(self, new_is = False):
# feed the sender with some balance # feed the sender with some balance
sender_addr = self.nodes[self.sender_idx].getnewaddress() sender_addr = self.nodes[self.sender_idx].getnewaddress()
self.nodes[0].sendtoaddress(sender_addr, 1) self.nodes[0].sendtoaddress(sender_addr, 1)
@ -126,9 +142,9 @@ class AutoInstantSendTest(DashTestFramework):
assert(not self.get_autoix_spork_state()) assert(not self.get_autoix_spork_state())
assert(self.send_regular_IX()) assert(self.send_regular_IX(not new_is))
assert(not self.send_simple_tx()) assert(self.send_simple_tx() if new_is else not self.send_simple_tx())
assert(not self.send_complex_tx()) assert(self.send_complex_tx() if new_is else not self.send_complex_tx())
self.activate_autoix_bip9() self.activate_autoix_bip9()
self.set_autoix_spork_state(True) self.set_autoix_spork_state(True)
@ -136,16 +152,16 @@ class AutoInstantSendTest(DashTestFramework):
assert(self.get_autoix_bip9_status() == 'active') assert(self.get_autoix_bip9_status() == 'active')
assert(self.get_autoix_spork_state()) assert(self.get_autoix_spork_state())
assert(self.send_regular_IX()) assert(self.send_regular_IX(not new_is))
assert(self.send_simple_tx()) assert(self.send_simple_tx())
assert(not self.send_complex_tx()) assert(self.send_complex_tx() if new_is else not self.send_complex_tx())
self.set_autoix_spork_state(False) self.set_autoix_spork_state(False)
assert(not self.get_autoix_spork_state()) assert(not self.get_autoix_spork_state())
assert(self.send_regular_IX()) assert(self.send_regular_IX(not new_is))
assert(not self.send_simple_tx()) assert(self.send_simple_tx() if new_is else not self.send_simple_tx())
assert(not self.send_complex_tx()) assert(self.send_complex_tx() if new_is else not self.send_complex_tx())
if __name__ == '__main__': if __name__ == '__main__':