diff --git a/backup/backend.py b/backup/backend.py index 516bf07..b14f740 100644 --- a/backup/backend.py +++ b/backup/backend.py @@ -93,7 +93,7 @@ class Backend(object): return stmt def _restore_transaction(self, tx: Iterator[str]): - assert(self.db) + assert self.db cur = self.db.cursor() for q in tx: q = self._rewrite_stmt(q) diff --git a/backup/backends.py b/backup/backends.py index 3576543..e59a92c 100644 --- a/backup/backends.py +++ b/backup/backends.py @@ -28,6 +28,6 @@ def get_backend(destination, create=False, require_init=False): initialized = backend.initialize() if require_init and not initialized: kill("Could not initialize the backup {}, please use 'backup-cli' to initialize the backup first.".format(destination)) - assert(backend.version is not None) - assert(backend.prev_version is not None) - return backend \ No newline at end of file + assert backend.version is not None + assert backend.prev_version is not None + return backend diff --git a/backup/backup.py b/backup/backup.py index 3d10377..4874ff3 100755 --- a/backup/backup.py +++ b/backup/backup.py @@ -60,7 +60,7 @@ def check_first_write(plugin, data_version): def on_db_write(writes, data_version, plugin, **kwargs): change = Change(data_version, None, writes) if not plugin.initialized: - assert(check_first_write(plugin, change.version)) + assert check_first_write(plugin, change.version) plugin.initialized = True if plugin.backend.add_change(change): diff --git a/backup/filebackend.py b/backup/filebackend.py index 3f0bc57..22e25de 100644 --- a/backup/filebackend.py +++ b/backup/filebackend.py @@ -119,7 +119,7 @@ class FileBackend(Backend): if version != self.version: raise ValueError("Versions do not match up: restored version {}, backend version {}".format(version, self.version)) - assert(version == self.version) + assert version == self.version def compact(self): stop = self.version # Stop one version short of the head when compacting diff --git a/backup/server.py b/backup/server.py index 8a03712..82391f3 100644 --- a/backup/server.py +++ b/backup/server.py @@ -44,7 +44,7 @@ def setup_server_logging(mode, level): root_logger.handlers = [] root_logger.addHandler(SystemdHandler()) else: - assert(mode == 'plain') + assert mode == 'plain' class SocketServer: diff --git a/backup/socketbackend.py b/backup/socketbackend.py index 85be586..535acc3 100644 --- a/backup/socketbackend.py +++ b/backup/socketbackend.py @@ -115,7 +115,7 @@ class SocketBackend(Backend): else: # TODO NAME is assumed to be IPv4 for now self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) else: - assert(self.url.proxytype == ProxyType.SOCKS5) + assert self.url.proxytype == ProxyType.SOCKS5 import socks self.sock = socks.socksocket() self.sock.set_proxy(socks.SOCKS5, self.url.proxytarget.host, self.url.proxytarget.port) @@ -146,7 +146,7 @@ class SocketBackend(Backend): def _request_metadata(self) -> None: self._send_packet(PacketType.REQ_METADATA, b'') (typ, payload) = self._recv_packet() - assert(typ == PacketType.METADATA) + assert typ == PacketType.METADATA self.protocol, self.version, self.prev_version, self.version_count = struct.unpack("!IIIQ", payload) def add_change(self, entry: Change) -> bool: @@ -177,7 +177,7 @@ class SocketBackend(Backend): self._send_packet(typ, payload) # Wait for change to be acknowledged before continuing. (typ, _) = self._recv_packet() - assert(typ == PacketType.ACK) + assert typ == PacketType.ACK except (BrokenPipeError, OSError): pass else: @@ -203,7 +203,7 @@ class SocketBackend(Backend): self._send_packet(PacketType.REWIND, version) # Wait for change to be acknowledged before continuing. (typ, _) = self._recv_packet() - assert(typ == PacketType.ACK) + assert typ == PacketType.ACK return True def stream_changes(self) -> Iterator[Change]: @@ -222,10 +222,10 @@ class SocketBackend(Backend): if version != self.version: raise ValueError("Versions do not match up: restored version {}, backend version {}".format(version, self.version)) - assert(version == self.version) + assert version == self.version def compact(self): self._send_packet(PacketType.COMPACT, b'') (typ, payload) = self._recv_packet() - assert(typ == PacketType.COMPACT_RES) + assert typ == PacketType.COMPACT_RES return json.loads(payload.decode()) diff --git a/backup/test_backup.py b/backup/test_backup.py index 8f3f625..1509d19 100644 --- a/backup/test_backup.py +++ b/backup/test_backup.py @@ -28,13 +28,13 @@ def test_start(node_factory, directory): } l1 = node_factory.get_node(options=opts, cleandir=False) plugins = [os.path.basename(p['name']) for p in l1.rpc.plugin("list")['plugins']] - assert("backup.py" in plugins) + assert "backup.py" in plugins # Restart the node a couple of times, to check that we can resume normally for i in range(5): l1.restart() plugins = [os.path.basename(p['name']) for p in l1.rpc.plugin("list")['plugins']] - assert("backup.py" in plugins) + assert "backup.py" in plugins def test_start_no_init(node_factory, directory): @@ -53,9 +53,7 @@ def test_start_no_init(node_factory, directory): # The way we detect a failure to start is when start() is running # into timeout looking for 'Server started with public key'. l1.start() - assert(l1.daemon.is_in_log( - r'Could not find backup.lock in the lightning-dir' - )) + assert l1.daemon.is_in_log(r'Could not find backup.lock in the lightning-dir') def test_init_not_empty(node_factory, directory): @@ -69,14 +67,14 @@ def test_init_not_empty(node_factory, directory): l1.stop() out = subprocess.check_output([cli_path, "init", "--lightning-dir", bpath, bdest]) - assert(b'Found an existing database' in out) - assert(b'Successfully written initial snapshot' in out) + assert b'Found an existing database' in out + assert b'Successfully written initial snapshot' in out # Now restart and add the plugin l1.daemon.opts['plugin'] = plugin_path l1.daemon.opts['allow-deprecated-apis'] = deprecated_apis l1.start() - assert(l1.daemon.is_in_log(r'plugin-backup.py: Versions match up')) + assert l1.daemon.is_in_log(r'plugin-backup.py: Versions match up') @flaky @@ -109,7 +107,7 @@ def test_tx_abort(node_factory, directory): print(l1.db.query("SELECT * FROM vars;")) l1.restart() - assert(l1.daemon.is_in_log(r'Last changes not applied')) + assert l1.daemon.is_in_log(r'Last changes not applied') @flaky @@ -146,7 +144,7 @@ def test_failing_restore(node_factory, directory): l1.daemon.proc.wait() section("Verifying the node died with an error") - assert(l1.daemon.is_in_log(r'lost some state') is not None) + assert l1.daemon.is_in_log(r'lost some state') is not None def test_intermittent_backup(node_factory, directory): @@ -175,7 +173,7 @@ def test_intermittent_backup(node_factory, directory): l1.start() l1.daemon.proc.wait() - assert(l1.daemon.is_in_log(r'Backup is out of date') is not None) + assert l1.daemon.is_in_log(r'Backup is out of date') is not None def test_restore(node_factory, directory): @@ -228,9 +226,8 @@ def test_warning(directory, node_factory): l1 = node_factory.get_node(options=opts, cleandir=False) l1.stop() - assert(l1.daemon.is_in_log( - r'The `--backup-destination` option is deprecated and will be removed in future versions of the backup plugin.' - )) + assert l1.daemon.is_in_log(r'The `--backup-destination` option is deprecated and will be removed in future versions of the backup plugin.') + class DummyBackend(Backend): def __init__(self): @@ -248,7 +245,7 @@ def test_rewrite(): b = DummyBackend() for i, o in tests: - assert(b._rewrite_stmt(i) == o) + assert b._rewrite_stmt(i) == o def test_restore_pre_4090(directory): @@ -308,31 +305,31 @@ def test_parse_socket_url(): # IPv4 s = socketbackend.parse_socket_url('socket:127.0.0.1:1234') - assert(s.target.host == '127.0.0.1') - assert(s.target.port == 1234) - assert(s.target.addrtype == socketbackend.AddrType.IPv4) - assert(s.proxytype == socketbackend.ProxyType.DIRECT) + assert s.target.host == '127.0.0.1' + assert s.target.port == 1234 + assert s.target.addrtype == socketbackend.AddrType.IPv4 + assert s.proxytype == socketbackend.ProxyType.DIRECT # IPv6 s = socketbackend.parse_socket_url('socket:[::1]:1235') - assert(s.target.host == '::1') - assert(s.target.port == 1235) - assert(s.target.addrtype == socketbackend.AddrType.IPv6) - assert(s.proxytype == socketbackend.ProxyType.DIRECT) + assert s.target.host == '::1' + assert s.target.port == 1235 + assert s.target.addrtype == socketbackend.AddrType.IPv6 + assert s.proxytype == socketbackend.ProxyType.DIRECT # Hostname s = socketbackend.parse_socket_url('socket:backup.local:1236') - assert(s.target.host == 'backup.local') - assert(s.target.port == 1236) - assert(s.target.addrtype == socketbackend.AddrType.NAME) - assert(s.proxytype == socketbackend.ProxyType.DIRECT) + assert s.target.host == 'backup.local' + assert s.target.port == 1236 + assert s.target.addrtype == socketbackend.AddrType.NAME + assert s.proxytype == socketbackend.ProxyType.DIRECT # Tor s = socketbackend.parse_socket_url('socket:backupserver.onion:1234?proxy=socks5:127.0.0.1:9050') - assert(s.target.host == 'backupserver.onion') - assert(s.target.port == 1234) - assert(s.target.addrtype == socketbackend.AddrType.NAME) - assert(s.proxytype == socketbackend.ProxyType.SOCKS5) - assert(s.proxytarget.host == '127.0.0.1') - assert(s.proxytarget.port == 9050) - assert(s.proxytarget.addrtype == socketbackend.AddrType.IPv4) + assert s.target.host == 'backupserver.onion' + assert s.target.port == 1234 + assert s.target.addrtype == socketbackend.AddrType.NAME + assert s.proxytype == socketbackend.ProxyType.SOCKS5 + assert s.proxytarget.host == '127.0.0.1' + assert s.proxytarget.port == 9050 + assert s.proxytarget.addrtype == socketbackend.AddrType.IPv4