Skip to content

Commit a2324e4

Browse files
committed
test: Improve naming and logging of avoid_reuse tests
1 parent 1abbdac commit a2324e4

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

test/functional/wallet_avoidreuse.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ def run_test(self):
8585
self.sync_all()
8686
self.test_change_remains_change(self.nodes[1])
8787
reset_balance(self.nodes[1], self.nodes[0].getnewaddress())
88-
self.test_fund_send_fund_senddirty()
88+
self.test_sending_from_reused_address_without_avoid_reuse()
8989
reset_balance(self.nodes[1], self.nodes[0].getnewaddress())
90-
self.test_fund_send_fund_send("legacy")
90+
self.test_sending_from_reused_address_fails("legacy")
9191
reset_balance(self.nodes[1], self.nodes[0].getnewaddress())
92-
self.test_fund_send_fund_send("p2sh-segwit")
92+
self.test_sending_from_reused_address_fails("p2sh-segwit")
9393
reset_balance(self.nodes[1], self.nodes[0].getnewaddress())
94-
self.test_fund_send_fund_send("bech32")
94+
self.test_sending_from_reused_address_fails("bech32")
9595
reset_balance(self.nodes[1], self.nodes[0].getnewaddress())
9696
self.test_getbalances_used()
9797
reset_balance(self.nodes[1], self.nodes[0].getnewaddress())
@@ -166,13 +166,13 @@ def test_change_remains_change(self, node):
166166
for logical_tx in node.listtransactions():
167167
assert logical_tx.get('address') != changeaddr
168168

169-
def test_fund_send_fund_senddirty(self):
169+
def test_sending_from_reused_address_without_avoid_reuse(self):
170170
'''
171-
Test the same as test_fund_send_fund_send, except send the 10 BTC with
171+
Test the same as test_sending_from_reused_address_fails, except send the 10 BTC with
172172
the avoid_reuse flag set to false. This means the 10 BTC send should succeed,
173-
where it fails in test_fund_send_fund_send.
173+
where it fails in test_sending_from_reused_address_fails.
174174
'''
175-
self.log.info("Test fund send fund send dirty")
175+
self.log.info("Test sending from reused address with avoid_reuse=false")
176176

177177
fundaddr = self.nodes[1].getnewaddress()
178178
retaddr = self.nodes[0].getnewaddress()
@@ -217,7 +217,7 @@ def test_fund_send_fund_senddirty(self):
217217
assert_approx(self.nodes[1].getbalance(), 5, 0.001)
218218
assert_approx(self.nodes[1].getbalance(avoid_reuse=False), 5, 0.001)
219219

220-
def test_fund_send_fund_send(self, second_addr_type):
220+
def test_sending_from_reused_address_fails(self, second_addr_type):
221221
'''
222222
Test the simple case where [1] generates a new address A, then
223223
[0] sends 10 BTC to A.
@@ -226,7 +226,7 @@ def test_fund_send_fund_send(self, second_addr_type):
226226
[1] tries to spend 10 BTC (fails; dirty).
227227
[1] tries to spend 4 BTC (succeeds; change address sufficient)
228228
'''
229-
self.log.info("Test fund send fund send")
229+
self.log.info("Test sending from reused {} address fails".format(second_addr_type))
230230

231231
fundaddr = self.nodes[1].getnewaddress(label="", address_type="legacy")
232232
retaddr = self.nodes[0].getnewaddress()

0 commit comments

Comments
 (0)