Skip to content

test_lightningd.py: more minor flake8 fixes. #1111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdecker merged 1 commit into from
Feb 26, 2018
Merged

test_lightningd.py: more minor flake8 fixes. #1111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions tests/test_lightningd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2762,23 +2762,23 @@ def test_withdraw(self):
assert(c.fetchone()[0] == 10)

# Renable when the bitcoin wallet can generate a "bcrt1" address
#waddr = l1.bitcoin.rpc.getnewaddress()
# waddr = l1.bitcoin.rpc.getnewaddress()
# Instead for now, Use an address from l3
waddr = l3.rpc.newaddr('bech32')['address']
# Now attempt to withdraw some (making sure we collect multiple inputs)
self.assertRaises(ValueError, l1.rpc.withdraw, 'not an address', amount)
self.assertRaises(ValueError, l1.rpc.withdraw, waddr, 'not an amount')
self.assertRaises(ValueError, l1.rpc.withdraw, waddr, -amount)

out = l1.rpc.withdraw(waddr, 2 * amount)
l1.rpc.withdraw(waddr, 2 * amount)

# Make sure bitcoind received the withdrawal
unspent = l1.bitcoin.rpc.listunspent(0)
withdrawal = [u for u in unspent if u['txid'] == out['txid']]
# Skip these checks because the withdrawal was made to a lightning wallet
# Renable when the bitcoin wallet can generate a "bcrt1" address
#assert(len(withdrawal) == 1)
#assert(withdrawal[0]['amount'] == Decimal('0.02'))
# unspent = l1.bitcoin.rpc.listunspent(0)
# withdrawal = [u for u in unspent if u['txid'] == out['txid']]
# assert(len(withdrawal) == 1)
# assert(withdrawal[0]['amount'] == Decimal('0.02'))

# Now make sure two of them were marked as spent
c = db.cursor()
Expand All @@ -2788,7 +2788,7 @@ def test_withdraw(self):
# Now send some money to l2.
# lightningd uses P2SH-P2WPKH
waddr = l2.rpc.newaddr('bech32')['address']
out = l1.rpc.withdraw(waddr, 2 * amount)
l1.rpc.withdraw(waddr, 2 * amount)
l1.bitcoin.rpc.generate(1)

# Make sure l2 received the withdrawal.
Expand All @@ -2807,7 +2807,7 @@ def test_withdraw(self):
self.assertRaises(ValueError, l1.rpc.withdraw, 'xx1qw508d6qejxtdg4y5r3zarvary0c5xw7kxpjzsx', 2 * amount)
self.assertRaises(ValueError, l1.rpc.withdraw, 'tb1pw508d6qejxtdg4y5r3zarvary0c5xw7kdl9fad', 2 * amount)
self.assertRaises(ValueError, l1.rpc.withdraw, 'tb1qw508d6qejxtdg4y5r3zarvary0c5xw7kxxxxxx', 2 * amount)
out = l1.rpc.withdraw(waddr, 2 * amount)
l1.rpc.withdraw(waddr, 2 * amount)
l1.bitcoin.rpc.generate(1)
# Now make sure additional two of them were marked as spent
c = db.cursor()
Expand All @@ -2820,7 +2820,7 @@ def test_withdraw(self):
self.assertRaises(ValueError, l1.rpc.withdraw, 'xx1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7', 2 * amount)
self.assertRaises(ValueError, l1.rpc.withdraw, 'tb1prp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3qsm03tq', 2 * amount)
self.assertRaises(ValueError, l1.rpc.withdraw, 'tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3qxxxxxx', 2 * amount)
out = l1.rpc.withdraw(waddr, 2 * amount)
l1.rpc.withdraw(waddr, 2 * amount)
l1.bitcoin.rpc.generate(1)
# Now make sure additional two of them were marked as spent
c = db.cursor()
Expand Down Expand Up @@ -2851,13 +2851,13 @@ def test_withdraw(self):
assert(c.fetchone()[0] == 6)

# Test withdrawal to self.
out = l1.rpc.withdraw(l1.rpc.newaddr('bech32')['address'], 'all')
l1.rpc.withdraw(l1.rpc.newaddr('bech32')['address'], 'all')
bitcoind.rpc.generate(1)
c = db.cursor()
c.execute('SELECT COUNT(*) FROM outputs WHERE status=0')
assert(c.fetchone()[0] == 1)

out = l1.rpc.withdraw(waddr, 'all')
l1.rpc.withdraw(waddr, 'all')
c = db.cursor()
c.execute('SELECT COUNT(*) FROM outputs WHERE status=0')
assert(c.fetchone()[0] == 0)
Expand Down