ttrivial clean-up (typing/imports) - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit a32af44ff9657276999f3785bced0a44f9e05584
DIR parent 02fcc6f570ae60a47f9f29b4d375059d6621dd31
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Fri, 28 Feb 2020 20:27:35 +0100
ttrivial clean-up (typing/imports)
Diffstat:
M electrum/channel_db.py | 2 +-
M electrum/lnonion.py | 9 +++++----
M electrum/lnpeer.py | 2 +-
M electrum/lnworker.py | 4 +---
M electrum/transaction.py | 2 +-
5 files changed, 9 insertions(+), 10 deletions(-)
---
DIR diff --git a/electrum/channel_db.py b/electrum/channel_db.py
t@@ -254,7 +254,7 @@ class ChannelDB(SqlDB):
# initialized in load_data
self._channels = {} # type: Dict[bytes, ChannelInfo]
self._policies = {} # type: Dict[Tuple[bytes, bytes], Policy] # (node_id, scid) -> Policy
- self._nodes = {}
+ self._nodes = {} # type: Dict[bytes, NodeInfo] # node_id -> NodeInfo
# node_id -> (host, port, ts)
self._addresses = defaultdict(set) # type: Dict[bytes, Set[Tuple[str, int, int]]]
self._channels_for_node = defaultdict(set) # type: Dict[bytes, Set[ShortChannelID]]
DIR diff --git a/electrum/lnonion.py b/electrum/lnonion.py
t@@ -26,8 +26,8 @@
import hashlib
from typing import Sequence, List, Tuple, NamedTuple, TYPE_CHECKING
from enum import IntEnum, IntFlag
-from Cryptodome.Cipher import ChaCha20
+from Cryptodome.Cipher import ChaCha20
from . import ecc
from .crypto import sha256, hmac_oneshot
t@@ -231,9 +231,10 @@ def generate_cipher_stream(stream_key: bytes, num_bytes: int) -> bytes:
return cipher.encrypt(bytes(num_bytes))
-ProcessedOnionPacket = NamedTuple("ProcessedOnionPacket", [("are_we_final", bool),
- ("hop_data", OnionHopsDataSingle),
- ("next_packet", OnionPacket)])
+class ProcessedOnionPacket(NamedTuple):
+ are_we_final: bool
+ hop_data: OnionHopsDataSingle
+ next_packet: OnionPacket
# TODO replay protection
DIR diff --git a/electrum/lnpeer.py b/electrum/lnpeer.py
t@@ -320,7 +320,7 @@ class Peer(Logger):
try:
await asyncio.wait_for(self.initialized, LN_P2P_NETWORK_TIMEOUT)
except Exception as e:
- raise GracefulDisconnect(f"Failed to initialize: {e}") from e
+ raise GracefulDisconnect(f"Failed to initialize: {e!r}") from e
if self.lnworker == self.lnworker.network.lngossip:
try:
ids, complete = await asyncio.wait_for(self.get_channel_range(), LN_P2P_NETWORK_TIMEOUT)
DIR diff --git a/electrum/lnworker.py b/electrum/lnworker.py
t@@ -7,7 +7,7 @@ import os
from decimal import Decimal
import random
import time
-from typing import Optional, Sequence, Tuple, List, Dict, TYPE_CHECKING
+from typing import Optional, Sequence, Tuple, List, Dict, TYPE_CHECKING, NamedTuple
import threading
import socket
import json
t@@ -106,8 +106,6 @@ FALLBACK_NODE_LIST_MAINNET = [
]
-from typing import NamedTuple
-
class PaymentInfo(NamedTuple):
payment_hash: bytes
amount: int
DIR diff --git a/electrum/transaction.py b/electrum/transaction.py
t@@ -180,7 +180,7 @@ class TxOutpoint(NamedTuple):
def to_str(self) -> str:
return f"{self.txid.hex()}:{self.out_idx}"
- def to_json(self) -> str:
+ def to_json(self):
return [self.txid.hex(), self.out_idx]
def serialize_to_network(self) -> bytes: