lint: fix pylint issues

apoelstra · apoelstra · commit 242586cea638 · 2021-10-15T00:20:23.000Z
diff --git a/contrib/assets_tutorial/assets_tutorial.py b/contrib/assets_tutorial/assets_tutorial.py
@@ -6,7 +6,7 @@
 import sys
 from decimal import Decimal
 
-## 0. Boilerplate to make the tutorial executable as a script
+# 0. Boilerplate to make the tutorial executable as a script
 #
 # Skip ahead to step 1 if you are reading
 #
@@ -44,7 +44,7 @@
     not args.no_cleanup,
 )
 
-## 1. Start nodes
+# 1. Start nodes
 print ("1. Start nodes")
 #
 # 1a. Confirm that we not start an elements node if validatepegin is set and there
@@ -132,7 +132,7 @@
 assert e1.getblockcount() == 10
 assert e1.getbestblockhash() == e2.getbestblockhash()
 
-## 2. Basic wallet usage
+# 2. Basic wallet usage
 print ("")
 print ("2. Basic wallet usage")
 
@@ -225,7 +225,7 @@
 else:
     raise Exception("Transaction 3 should not be in wallet 1")
 
-## 3. Confidential assets and keys
+# 3. Confidential assets and keys
 print ("")
 print ("3. Confidential Keys")
 current_e1_balance = e1.getbalance()
@@ -264,7 +264,7 @@
 e1.generatetoaddress(1, e1.getnewaddress())
 sync_all([e1, e2])
 
-## 4. 2-of-2 multisig
+# 4. 2-of-2 multisig
 #
 # Let's build a blinded 2-of-2 multisig p2sh address
 print ("")
@@ -303,7 +303,7 @@
 assert e1.gettransaction(txid, True)['details'] != []
 assert e2.gettransaction(txid, True)['details'] != []
 
-## 5. Multi-asset support
+# 5. Multi-asset support
 #
 # Many of the RPC calls have added asset type or label arguments, and reveal
 # alternative asset information. With no argument all are listed. For example,
@@ -338,7 +338,6 @@
 assert new_issuances[0]['assetamount'] == 1
 assert new_issuances[0]['tokenamount'] == 1
 
-assert len(e2.listissuances()) == 1 ## ANDREW
 print ("5b. Reissue the asset using the reissuance token.")
 # If you gave `issueasset` a reissuance token argument greater than 0
 # you can also reissue the base asset. This will appear as a second issuance
@@ -449,7 +448,7 @@
 e1.generatetoaddress(1, e1.getnewaddress())
 sync_all([e1, e2])
 
-## 6. Blocksigning
+# 6. Blocksigning
 #
 # Up to now, we have been generating blocks to the default OP_TRUE script. Let's
 # make this script more interesting. We'll use a 2-of-2 multisig made from keys
@@ -561,7 +560,7 @@
 assert e1.getblockcount() == 1
 assert e2.getblockcount() == 1
 
-## The peg
+# The peg
 #
 # Everything peg-related can be done inside the Elements daemon directly,
 # except for processing pegouts. This is because processing pegouts involves
@@ -665,7 +664,7 @@
 e1.sendtomainchain(bitcoin.getnewaddress(), 5)
 
 
-## Exercise(s)
+# Exercise(s)
 #
 # 1. Implement really dumb/unsafe watchmen to allow pegouts for learning purposes.
 #    To custody the coins that users peg in, you need to extract the tweak from
diff --git a/contrib/assets_tutorial/pset_swap_tutorial.py b/contrib/assets_tutorial/pset_swap_tutorial.py
@@ -3,10 +3,8 @@
 from test_framework.authproxy import JSONRPCException
 from test_framework.daemon import Daemon, sync_all
 import argparse
-import sys
-from decimal import Decimal
 
-## PSET Swap Tutorial
+# PSET Swap Tutorial
 #
 # This script demonstrates how to implement an atomic swap, using a single
 # Elements transaction, between two parties, Alice and Carol. Alice has
@@ -18,7 +16,7 @@
 # going on.
 #
 
-## 0. Boilerplate to make the tutorial executable as a script
+# 0. Boilerplate to make the tutorial executable as a script
 #
 # Skip ahead to step 1 if you are reading
 #
@@ -47,7 +45,7 @@
     not args.no_cleanup,
 )
 
-## 1. Start nodes
+# 1. Start nodes
 print ("1. Start nodes and setup scenario")
 
 # 1a. Turn on both nodes. Disable -validatepegin as we will just swap the
@@ -92,7 +90,7 @@
 assert len(alice.listunspent()) > 0
 assert len(carol.listunspent()) > 0
 
-## 2. Construct a swap transaction in PSET format
+# 2. Construct a swap transaction in PSET format
 #
 # At this point node `alice` has 10.5MM "bitcoin" and node `carol` has 1000 of
 # a new asset. We want to do an atomic swap: 2500 BTC for 1000 of
@@ -119,7 +117,7 @@
 print ("    Alice: ", alice_addr)
 print ("    Carol: ", carol_addr)
 
-# Then they each create and fund (but don't sign!) partial transactions 
+# Then they each create and fund (but don't sign!) partial transactions
 # which simply send the assets to each other.
 print ("2b. Exchange partial transaction data")
 raw_tx_a = alice.createrawtransaction(outputs=[{carol_addr: 2500}])
@@ -148,12 +146,12 @@
 assert feerate > 0.1 # should probably compare against your own feerate
 assert found_my_output
 
-##
-## Check that none of the inputs in the counterparty's transaction actually
-## belong to us. This is the second-most important check (after making sure
-## that your outputs are present :)) and by far the easiest to forget. Do
-## not forget this!!!
-##
+#
+# Check that none of the inputs in the counterparty's transaction actually
+# belong to us. This is the second-most important check (after making sure
+# that your outputs are present :)) and by far the easiest to forget. Do
+# not forget this!!!
+#
 
 # The way we do this check in Python is by making a set of each
 # output the wallet can spend...
@@ -235,7 +233,7 @@
 assert not any([x["is_final"] for x in analysis["inputs"]])
 assert all([x["next"] == "updater" for x in analysis["inputs"]])
 
-## 3. Update the PSET
+# 3. Update the PSET
 #
 # Before blinding can take place, both parties need to provide UTXO data
 # for their inputs. They can share this data by either updating the PSET
@@ -258,7 +256,7 @@
 assert not any([x["is_final"] for x in analysis["inputs"]])
 assert all([x["next"] == "signer" for x in analysis["inputs"]])
 
-## 4. Blind the PSET
+# 4. Blind the PSET
 #
 # Both parties now blind the PSET. Importantly, the final person to blind must
 # have a combined PSET that has everyone else's blinding data included, so that
@@ -314,7 +312,7 @@
 assert not any([x["is_final"] for x in analysis["inputs"]])
 assert all([x["next"] == "signer" for x in analysis["inputs"]])
 
-## 5. Sign the PSET
+# 5. Sign the PSET
 #
 # When signing, there are a couple options for workflows. Each party can sign
 # in turn, like we did when blinding, or they can each sign independently and
diff --git a/contrib/assets_tutorial/test_framework/daemon.py b/contrib/assets_tutorial/test_framework/daemon.py
@@ -1,7 +1,6 @@
 
 from test_framework.authproxy import AuthServiceProxy
 
-import pathlib
 import tempfile
 import time
 import shutil
@@ -41,7 +40,7 @@ def shutdown(self):
         if self.proc is not None:
             print ("Shutting down %s" % self.name)
             self.proc.terminate()
-            ## FIXME determine why we need 30+ seconds to shut down with a tiny regtest chain
+            # FIXME determine why we need 30+ seconds to shut down with a tiny regtest chain
             self.proc.wait(120)
             self.proc = None
 
@@ -92,8 +91,6 @@ def __getitem__(self, key):
         return self.config[key]
 
 def sync_all(nodes, timeout_sec = 10):
-    totalWait = timeout_sec
-
     stop_time = time.time() + timeout_sec
     while time.time() <= stop_time:
         best_hash = [x.getbestblockhash() for x in nodes]
diff --git a/test/functional/data/invalid_txs.py b/test/functional/data/invalid_txs.py
@@ -49,7 +49,7 @@
 #    OP_RIGHT,
 #    OP_RSHIFT,
 #    OP_SUBSTR,
-    OP_TRUE,
+#    OP_TRUE,
 #    OP_XOR,
 )
 from test_framework.script_util import (
diff --git a/test/functional/feature_fedpeg.py b/test/functional/feature_fedpeg.py
@@ -20,7 +20,6 @@
     COIN,
     CBlock,
     COutPoint,
-    CTransaction,
     CTxIn,
     CTxInWitness,
     CTxOut,
diff --git a/test/functional/feature_issuance.py b/test/functional/feature_issuance.py
@@ -482,7 +482,7 @@ def run_test(self):
         self.nodes[0].generate(1)
         assert_equal(self.nodes[0].gettransaction(tx_id)["confirmations"], 1)
 
-        ## Regression for one form of https://github.com/bitcoin/bitcoin/issues/20347
+        # Regression for one form of https://github.com/bitcoin/bitcoin/issues/20347
         # 1. Leave node 1 with only a single small explicit output
         self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), self.nodes[1].getbalance()['bitcoin'], "", "", True)
         blind_addr = self.nodes[1].getnewaddress()
@@ -497,8 +497,7 @@ def run_test(self):
         #    in the 3-output case. As the bug causes us to do coin selection for
         #    the former while attempting to produce the latter, we will trigger
         #    an "impossible" case and a confusing/generic error message.
-        txid = self.nodes[1].issueasset(0, 1, False)["txid"]
-        tx = self.nodes[1].getrawtransaction(txid, True)
+        self.nodes[1].issueasset(0, 1, False)["txid"]
 
 if __name__ == '__main__':
     IssuanceTest ().main ()
diff --git a/test/functional/feature_taphash_pegins_issuances.py b/test/functional/feature_taphash_pegins_issuances.py
@@ -6,9 +6,9 @@
 #
 # Test for taproot sighash algorithm with pegins and issuances
 
-from test_framework.key import ECKey, ECPubKey, compute_xonly_pubkey, generate_privkey, sign_schnorr, tweak_add_privkey, tweak_add_pubkey, verify_schnorr
-from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxInWitness, CTxOut, CTxOutValue, CTxOutWitness, tx_from_hex, uint256_from_str
-from test_framework.test_framework import BitcoinTestFramework, SkipTest
+from test_framework.key import compute_xonly_pubkey, generate_privkey, sign_schnorr, tweak_add_privkey, tweak_add_pubkey, verify_schnorr
+from test_framework.messages import COutPoint, CTxIn, CTxInWitness, CTxOut, CTxOutValue, CTxOutWitness, tx_from_hex, uint256_from_str
+from test_framework.test_framework import BitcoinTestFramework
 from test_framework.script import TaprootSignatureHash, taproot_construct, taproot_pad_sighash_ty, SIGHASH_DEFAULT, SIGHASH_ALL, SIGHASH_NONE, SIGHASH_SINGLE, SIGHASH_ANYONECANPAY
 
 VALID_SIGHASHES_ECDSA = [
@@ -77,7 +77,7 @@ def create_taproot_utxo(self):
 
         tx = self.nodes[0].blindrawtransaction(fund_tx.serialize().hex())
         signed_raw_tx = self.nodes[0].signrawtransactionwithwallet(tx)
-        _txid = self.nodes[0].sendrawtransaction(signed_raw_tx['hex'])
+        self.nodes[0].sendrawtransaction(signed_raw_tx['hex'])
         tx = tx_from_hex(signed_raw_tx['hex'])
         tx.rehash()
         self.nodes[0].generate(1)
diff --git a/test/functional/feature_tapscript_opcodes.py b/test/functional/feature_tapscript_opcodes.py
@@ -8,10 +8,10 @@
 
 from random import randint
 from test_framework.util import BITCOIN_ASSET_BYTES, assert_raises_rpc_error, satoshi_round
-from test_framework.key import ECKey, ECPubKey, compute_xonly_pubkey, generate_privkey, sign_schnorr, tweak_add_privkey, tweak_add_pubkey, verify_schnorr
-from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxInWitness, CTxOut, CTxOutNonce, CTxOutValue, CTxOutWitness, ser_uint256, sha256, tx_from_hex, uint256_from_str
+from test_framework.key import ECKey, compute_xonly_pubkey, generate_privkey, sign_schnorr
+from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxInWitness, CTxOut, CTxOutNonce, CTxOutValue, ser_uint256, sha256, tx_from_hex
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.script import CScript, CScriptNum, CScriptOp, OP_0, OP_1, OP_2, OP_3, OP_4, OP_5, OP_6, OP_7, OP_ADD64, OP_AND, OP_CAT, OP_CHECKSIGFROMSTACK, OP_DIV64, OP_DROP, OP_DUP, OP_ECMULSCALARVERIFY, OP_ELSE, OP_EQUAL, OP_EQUALVERIFY, OP_FALSE, OP_FROMALTSTACK, OP_GREATERTHAN64, OP_GREATERTHANOREQUAL64, OP_INSPECTINPUTASSET, OP_INSPECTINPUTISSUANCE, OP_INSPECTINPUTOUTPOINT, OP_INSPECTINPUTSCRIPTPUBKEY, OP_INSPECTINPUTSEQUENCE, OP_INSPECTINPUTVALUE, OP_INSPECTLOCKTIME, OP_INSPECTNUMINPUTS, OP_INSPECTNUMOUTPUTS, OP_INSPECTOUTPUTASSET, OP_INSPECTOUTPUTNONCE, OP_INSPECTOUTPUTSCRIPTPUBKEY, OP_INSPECTOUTPUTVALUE, OP_IF, OP_INSPECTVERSION, OP_LE32TOLE64, OP_LE64TOSCRIPTNUM, OP_LESSTHAN64, OP_LESSTHANOREQUAL64, OP_MUL64, OP_NEG64, OP_NOT, OP_INVERT, OP_NOTIF, OP_OR, OP_PUSHCURRENTINPUTINDEX, OP_SCRIPTNUMTOLE64, OP_SHA256FINALIZE, OP_SHA256INITIALIZE, OP_SHA256UPDATE, OP_SIZE, OP_SUB64, OP_SWAP, OP_TWEAKVERIFY, OP_TOALTSTACK, OP_TXWEIGHT, OP_VERIFY, OP_XOR, OP_XOR, TaprootSignatureHash, taproot_construct, SIGHASH_DEFAULT, SIGHASH_ALL, SIGHASH_NONE, SIGHASH_SINGLE, SIGHASH_ANYONECANPAY
+from test_framework.script import CScript, CScriptNum, CScriptOp, OP_0, OP_1, OP_2, OP_ADD64, OP_AND, OP_CHECKSIGFROMSTACK, OP_DIV64, OP_DROP, OP_DUP, OP_ECMULSCALARVERIFY, OP_EQUAL, OP_EQUALVERIFY, OP_FALSE, OP_FROMALTSTACK, OP_GREATERTHAN64, OP_GREATERTHANOREQUAL64, OP_INSPECTINPUTASSET, OP_INSPECTINPUTISSUANCE, OP_INSPECTINPUTOUTPOINT, OP_INSPECTINPUTSCRIPTPUBKEY, OP_INSPECTINPUTSEQUENCE, OP_INSPECTINPUTVALUE, OP_INSPECTLOCKTIME, OP_INSPECTNUMINPUTS, OP_INSPECTNUMOUTPUTS, OP_INSPECTOUTPUTASSET, OP_INSPECTOUTPUTNONCE, OP_INSPECTOUTPUTSCRIPTPUBKEY, OP_INSPECTOUTPUTVALUE, OP_INSPECTVERSION, OP_LE32TOLE64, OP_LE64TOSCRIPTNUM, OP_LESSTHAN64, OP_LESSTHANOREQUAL64, OP_MUL64, OP_NEG64, OP_NOT, OP_INVERT, OP_OR, OP_PUSHCURRENTINPUTINDEX, OP_SCRIPTNUMTOLE64, OP_SHA256FINALIZE, OP_SHA256INITIALIZE, OP_SHA256UPDATE, OP_SIZE, OP_SUB64, OP_SWAP, OP_TWEAKVERIFY, OP_TOALTSTACK, OP_TXWEIGHT, OP_VERIFY, OP_XOR, taproot_construct, SIGHASH_DEFAULT, SIGHASH_ALL, SIGHASH_NONE, SIGHASH_SINGLE, SIGHASH_ANYONECANPAY
 
 import os
 
@@ -93,7 +93,7 @@ def create_taproot_utxo(self, scripts = None, blind = False):
 
         tx = self.nodes[0].blindrawtransaction(fund_tx.serialize().hex())
         signed_raw_tx = self.nodes[0].signrawtransactionwithwallet(tx)
-        _txid = self.nodes[0].sendrawtransaction(signed_raw_tx['hex'])
+        self.nodes[0].sendrawtransaction(signed_raw_tx['hex'])
         tx = tx_from_hex(signed_raw_tx['hex'])
         tx.rehash()
         self.nodes[0].generate(1)
@@ -102,11 +102,13 @@ def create_taproot_utxo(self, scripts = None, blind = False):
 
         return tx, prev_vout, spk, sec, pub, tap
 
-    def tapscript_satisfy_test(self, script, inputs = [], add_issuance = False,
-        add_pegin = False, fail=None, add_prevout=False, add_asset=False,
-        add_value=False, add_spk = False, seq = 0, add_out_spk = None,
-        add_out_asset = None, add_out_value = None, add_out_nonce = None,
-        ver = 2, locktime = 0, add_num_outputs=False, add_weight=False, blind=False):
+    def tapscript_satisfy_test(self, script, inputs = None, add_issuance = False,
+       add_pegin = False, fail=None, add_prevout=False, add_asset=False,
+       add_value=False, add_spk = False, seq = 0, add_out_spk = None,
+       add_out_asset = None, add_out_value = None, add_out_nonce = None,
+       ver = 2, locktime = 0, add_num_outputs=False, add_weight=False, blind=False):
+        if inputs is None:
+            inputs = []
         # Create a taproot utxo
         scripts = [("s0", script)]
         prev_tx, prev_vout, spk, sec, pub, tap = self.create_taproot_utxo(scripts)
@@ -387,20 +389,28 @@ def le8(x, signed=True):
 
         def check_add(a, b, c, fail=None):
             self.tapscript_satisfy_test(CScript([OP_ADD64, OP_VERIFY, le8(c), OP_EQUAL]), inputs = [le8(a), le8(b)], fail=fail)
+
         def check_sub(a, b, c, fail=None):
             self.tapscript_satisfy_test(CScript([OP_SUB64, OP_VERIFY, le8(c), OP_EQUAL]), inputs = [le8(a), le8(b)], fail=fail)
+
         def check_mul(a, b, c, fail=None):
             self.tapscript_satisfy_test(CScript([OP_MUL64, OP_VERIFY, le8(c), OP_EQUAL]), inputs = [le8(a), le8(b)], fail=fail)
+
         def check_div(a, b, q, r, fail=None):
             self.tapscript_satisfy_test(CScript([OP_DIV64, OP_VERIFY, le8(q), OP_EQUALVERIFY, le8(r), OP_EQUAL]), inputs = [le8(a), le8(b)], fail=fail)
+
         def check_le(a, b, res, fail=None):
             self.tapscript_satisfy_test(CScript([OP_LESSTHAN64, res, OP_EQUAL]), inputs = [le8(a), le8(b)], fail=fail)
+
         def check_leq(a, b, res, fail=None):
             self.tapscript_satisfy_test(CScript([OP_LESSTHANOREQUAL64, res, OP_EQUAL]), inputs = [le8(a), le8(b)], fail=fail)
+
         def check_ge(a, b, res, fail=None):
             self.tapscript_satisfy_test(CScript([OP_GREATERTHAN64, res, OP_EQUAL]), inputs = [le8(a), le8(b)], fail=fail)
+
         def check_geq(a, b, res, fail=None):
             self.tapscript_satisfy_test(CScript([OP_GREATERTHANOREQUAL64, res, OP_EQUAL]), inputs = [le8(a), le8(b)], fail=fail)
+
         def check_neg(a, res, fail=None):
             self.tapscript_satisfy_test(CScript([OP_NEG64, OP_VERIFY, le8(res), OP_EQUAL]), inputs = [le8(a)], fail=fail)
         # Arithematic opcodes
diff --git a/test/functional/rpc_invalid_address_message.py b/test/functional/rpc_invalid_address_message.py
@@ -24,7 +24,7 @@
 
 INVALID_ADDRESS = 'asfah14i8fajz0123f'
 
-## ELEMENTS
+# ELEMENTS
 BLECH32_VALID = 'el1qq0umk3pez693jrrlxz9ndlkuwne93gdu9g83mhhzuyf46e3mdzfpva0w48gqgzgrklncnm0k5zeyw8my2ypfsmxh4xcjh2rse'
 BLECH32_INVALID_BLECH32 = 'el1pq0umk3pez693jrrlxz9ndlkuwne93gdu9g83mhhzuyf46e3mdzfpva0w48gqgzgrklncnm0k5zeyw8my2ypfsxguu9nrdg2pc'
 BLECH32_INVALID_BLECH32M = 'el1qq0umk3pez693jrrlxz9ndlkuwne93gdu9g83mhhzuyf46e3mdzfpva0w48gqgzgrklncnm0k5zeyw8my2ypfsnnmzrstzt7de'
@@ -84,7 +84,7 @@ def test_validateaddress(self):
         assert not info['isvalid']
         assert_equal(info['error'], 'Invalid address format')
 
-        ## ELEMENTS
+        # ELEMENTS
         info = node.validateaddress(BLECH32_INVALID_SIZE)
         assert not info['isvalid']
         assert_equal(info['error'], 'Invalid Blech32 address data size')
@@ -116,7 +116,7 @@ def test_getaddressinfo(self):
 
         assert_raises_rpc_error(-5, "Invalid address format", node.getaddressinfo, INVALID_ADDRESS)
 
-        ## ELEMENTS
+        # ELEMENTS
         assert_raises_rpc_error(-5, "Invalid Blech32 address data size", node.getaddressinfo, BLECH32_INVALID_SIZE)
 
         assert_raises_rpc_error(-5, "Invalid prefix for Blech32 address", node.getaddressinfo, BLECH32_INVALID_PREFIX)
diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py
diff --git a/test/functional/rpc_rawtransaction.py b/test/functional/rpc_rawtransaction.py
diff --git a/test/functional/wallet_fallbackfee.py b/test/functional/wallet_fallbackfee.py

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`# OP_RIGHT,`
`50`	`50`	`# OP_RSHIFT,`
`51`	`51`	`# OP_SUBSTR,`
`52`		`- OP_TRUE,`
	`52`	`+# OP_TRUE,`
`53`	`53`	`# OP_XOR,`
`54`	`54`	`)`
`55`	`55`	`from test_framework.script_util import (`