mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-25 22:39:13 +02:00
Merge bitcoin/bitcoin#25867: lint: enable E722 do not use bare except
61bb4e783blint: enable E722 do not use bare except (Leonardo Lazzaro) Pull request description: Improve test code and enable E722 lint check. If you want to catch all exceptions that signal program errors, use except Exception: (bare except is equivalent to except BaseException:). Reference: https://peps.python.org/pep-0008/#programming-recommendations ACKs for top commit: MarcoFalke: lgtm ACK61bb4e783bTree-SHA512: c7497769d5745fa02c78a20f4a0e555d8d3996d64af6faf1ce28e22ac1d8be415b98e967294679007b7bda2a9fd04031a9d140b24201e00257ceadeb5c5d7665
This commit is contained in:
@@ -85,7 +85,7 @@ class ChainstateWriteCrashTest(BitcoinTestFramework):
|
||||
self.nodes[node_index].waitforblock(expected_tip)
|
||||
utxo_hash = self.nodes[node_index].gettxoutsetinfo()['hash_serialized_2']
|
||||
return utxo_hash
|
||||
except:
|
||||
except Exception:
|
||||
# An exception here should mean the node is about to crash.
|
||||
# If bitcoind exits, then try again. wait_for_node_exit()
|
||||
# should raise an exception if bitcoind doesn't exit.
|
||||
|
||||
@@ -85,7 +85,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
|
||||
self.connect_nodes(0, 2)
|
||||
try:
|
||||
self.sync_blocks([self.nodes[0], self.nodes[2]], timeout=5)
|
||||
except:
|
||||
except Exception:
|
||||
pass
|
||||
# node2 must remain at height 0
|
||||
assert_equal(self.nodes[2].getblockheader(self.nodes[2].getbestblockhash())['height'], 0)
|
||||
|
||||
@@ -16,7 +16,7 @@ def unidirectional_node_sync_via_rpc(node_src, node_dest):
|
||||
try:
|
||||
assert len(node_dest.getblock(blockhash, False)) > 0
|
||||
break
|
||||
except:
|
||||
except Exception:
|
||||
blocks_to_copy.append(blockhash)
|
||||
blockhash = node_src.getblockheader(blockhash, True)['previousblockhash']
|
||||
blocks_to_copy.reverse()
|
||||
|
||||
@@ -385,7 +385,7 @@ class P2PInterface(P2PConnection):
|
||||
self.message_count[msgtype] += 1
|
||||
self.last_message[msgtype] = message
|
||||
getattr(self, 'on_' + msgtype)(message)
|
||||
except:
|
||||
except Exception:
|
||||
print("ERROR delivering %s (%s)" % (repr(message), sys.exc_info()[0]))
|
||||
raise
|
||||
|
||||
|
||||
@@ -557,7 +557,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
|
||||
node.start(extra_args[i], *args, **kwargs)
|
||||
for node in self.nodes:
|
||||
node.wait_for_rpc_connection()
|
||||
except:
|
||||
except Exception:
|
||||
# If one node failed to start, stop the others
|
||||
self.stop_nodes()
|
||||
raise
|
||||
|
||||
@@ -829,7 +829,7 @@ class RPCOverloadWrapper():
|
||||
int(address ,16)
|
||||
is_hex = True
|
||||
desc = descsum_create('raw(' + address + ')')
|
||||
except:
|
||||
except Exception:
|
||||
desc = descsum_create('addr(' + address + ')')
|
||||
reqs = [{
|
||||
'desc': desc,
|
||||
|
||||
Reference in New Issue
Block a user