python: contrib: fix linter issues

Author: jgriffiths

src/swig_python/contrib/elements_tx.py

@@ -86,8 +86,8 @@ def test_tx(self):
         tx_add_output(tx, tx_output)
         ct_value = tx_confidential_value_from_satoshi(20000)
         tx_add_elements_raw_output(tx, script, None, ct_value, None, None, None, 0)
-        size = tx_get_length(tx, 0)
-        vsize = tx_vsize_from_weight(tx_get_weight(tx))
+        tx_get_length(tx, 0)
+        tx_vsize_from_weight(tx_get_weight(tx))
         for extra_flags in (0, WALLY_TX_FLAG_USE_ELEMENTS, WALLY_TX_FLAG_ALLOW_PARTIAL):
             tx_hex = tx_to_hex(tx, WALLY_TX_FLAG_USE_WITNESS | extra_flags)
             tx_bytes = tx_to_bytes(tx, WALLY_TX_FLAG_USE_WITNESS | extra_flags)

src/swig_python/contrib/mnemonic.py

@@ -50,12 +50,12 @@ def to_seed(self, mnemonic, passphrase = ''):
         try:
             m.generate(BIP39_ENTROPY_LEN_256 - 1)
             assert False
-        except:
+        except Exception as _:
             pass
         try:
             m.check(phrase + ' foo')
             assert False
-        except:
+        except Exception as _:
             pass
         assert m.to_entropy(phrase) == m.to_entropy(phrase.split())
         assert m.to_mnemonic(m.to_entropy(phrase)) == phrase

src/swig_python/contrib/psbt.py

@@ -150,7 +150,7 @@ def test_add_remove_tx_items(self):
             asset = hex_to_bytes('77' * 32)
             explicit_asset = hex_to_bytes('01' + '77' * 32)
             blinded_asset = hex_to_bytes('0a' + '77' * 32) # Dummy value
-            explicit_value = tx_confidential_value_from_satoshi(1234)
+            explicit_value = tx_confidential_value_from_satoshi(value)
             blinded_value = hex_to_bytes('08' + '55' * 32) # Dummy value
 
         # Inputs: BTC
@@ -166,9 +166,9 @@ def test_add_remove_tx_items(self):
 
         # Outputs: BTC
         psbt2 = psbt_init(2, 0, 0, 0, 0)
-        tx_output = tx_output_init(1234, script)
+        tx_output = tx_output_init(value, script)
         psbt_add_tx_output_at(psbt2, 0, 0, tx_output)
-        self.assertEqual(psbt_get_output_amount(psbt2, 0), 1234)
+        self.assertEqual(psbt_get_output_amount(psbt2, 0), value)
         self.assertEqual(psbt_get_output_script(psbt2, 0), script)
 
         if is_elements_build():
@@ -180,7 +180,7 @@ def test_add_remove_tx_items(self):
             # txout has explicit value/asset: Expect the values
             # set and no commitments in the PSET
             self.assertEqual(psbt_has_output_amount(pset2, 0), 1)
-            self.assertEqual(psbt_get_output_amount(pset2, 0), 1234)
+            self.assertEqual(psbt_get_output_amount(pset2, 0), value)
             self.assertEqual(psbt_get_output_value_commitment_len(pset2, 0), 0)
             self.assertTrue(not psbt_get_output_value_commitment(pset2, 0))
             self.assertEqual(psbt_get_output_script(pset2, 0), script)
@@ -339,7 +339,6 @@ def test_psbt(self):
         dummy_tap_internal_key = bytearray(b'\x01' * 32) # Untweaked x-only pubkey
         if is_elements_build():
             dummy_nonce = bytearray(b'\x00' * WALLY_TX_ASSET_CT_NONCE_LEN)
-            dummy_bf = bytearray(b'\x00' * BLINDING_FACTOR_LEN)
             dummy_blind_asset = bytearray(b'\x0a' * ASSET_COMMITMENT_LEN)
             dummy_blind_value = bytearray(b'\x08' * WALLY_TX_ASSET_CT_VALUE_UNBLIND_LEN)
             dummy_nonce = bytearray(b'\x02' * ASSET_COMMITMENT_LEN)

src/swig_python/contrib/reconcile_sigs.py

@@ -8,12 +8,11 @@
 except ImportError:
     have_pycoin = False
 
-USE_WITNESS = 1
 
 class TxTests(unittest.TestCase):
 
     def do_test_tx(self, sighash, index_, flags):
-        txhash, seq, script, witness_script = b'0' * 32, 0xffffffff, b'\x51', b'000000'
+        txhash, seq, script = b'0' * 32, 0xffffffff, b'\x51'
         out_script, spend_script, locktime = b'\x00\x00\x51', b'\x00\x51', 999999
         txs_in = [TxIn(txhash, 0, script, seq),
                   TxIn(txhash, 1, script+b'\x51', seq-1),
@@ -29,7 +28,7 @@ def do_test_tx(self, sighash, index_, flags):
                          3: TxOut(5003, spend_script)}
         unspent = pytx.unspents[index_]
         pytx_hex = pytx.as_hex()
-        if flags & USE_WITNESS:
+        if flags & WALLY_TX_FLAG_USE_WITNESS:
             pytx_hash = pytx.signature_for_hash_type_segwit(unspent.script, index_, sighash)
         else:
             pytx_hash = pytx.signature_hash(spend_script, index_, sighash)
@@ -44,7 +43,6 @@ def do_test_tx(self, sighash, index_, flags):
         tx_add_raw_output(tx, 54, out_script+b'\x51', 0)
         tx_add_raw_output(tx, 53, out_script+b'\x51\x51', 0)
         tx_hex = tx_to_hex(tx, 0)
-        amount = (index_ + 1) * 5000
         tx_hash = tx_get_btc_signature_hash(tx, index_,
                                             unspent.script, unspent.coin_value,
                                             sighash, flags)
@@ -57,7 +55,7 @@ def test_tx(self):
         for sighash in [WALLY_SIGHASH_ALL, WALLY_SIGHASH_NONE, WALLY_SIGHASH_SINGLE]:
             for index_ in [0, 1, 2, 3]:
                 for anyonecanpay in [0, WALLY_SIGHASH_ANYONECANPAY]:
-                    for flags in [0, USE_WITNESS]:
+                    for flags in [0, WALLY_TX_FLAG_USE_WITNESS]:
                         self.do_test_tx(sighash | anyonecanpay, index_, flags)
 
 

src/swig_python/contrib/signmessage.py

@@ -27,9 +27,10 @@ def test_signmessage(self):
         message = 'This is just a test message'.encode('ascii')
         priv_key_wif = 'cUeKHd5orzT3mz8P9pxyREHfsWtVfgsfDjiZZBcjUBAaGk1BTj7N'
         address = 'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB'
-        expected_signature = 'INbVnW4e6PeRmsv2Qgu8NuopvrVjkcxob+sX8OcZG0SALhWybUjzMLPdAsXI46YZGb0KQTRii+wWIQzRpG/U+S0=' 
+        expected_signature = b'INbVnW4e6PeRmsv2Qgu8NuopvrVjkcxob+sX8OcZG0SALhWybUjzMLPdAsXI46YZGb0KQTRii+wWIQzRpG/U+S0='
 
         signature = self.signmessage(priv_key_wif, message)
+        self.assertEqual(signature, expected_signature)
         self.assertTrue(self.verifymessage(address, signature, message))
 
 

src/swig_python/contrib/tx.py

@@ -19,7 +19,7 @@ def test_tx_witness(self):
 
         with self.assertRaises(ValueError):
             tx_witness_stack_clone(None)
-        cloned = tx_witness_stack_clone(witness)
+        tx_witness_stack_clone(witness)
 
     def test_tx_input(self):
         # Test invalid inputs
@@ -101,9 +101,9 @@ def test_tx(self):
         self.assertEqual(tx_get_total_output_satoshi(tx), 10000)
         tx_add_raw_output(tx, 20000, script, 0)
         self.assertEqual(tx_get_total_output_satoshi(tx), 30000)
-        size = tx_get_length(tx, 0)
-        vsize = tx_vsize_from_weight(tx_get_weight(tx))
-        tx_hex = tx_to_hex(tx, FLAG_USE_WITNESS)
+        tx_get_length(tx, 0)
+        tx_vsize_from_weight(tx_get_weight(tx))
+        tx_to_hex(tx, FLAG_USE_WITNESS)
 
         with self.assertRaises(ValueError):
             tx_add_raw_output(tx, WALLY_SATOSHI_MAX + 1, script, 0)