run lint with pyupgrade at py39-plus

libp2p/peer/addrbook_interface.py

@@ -2,8 +2,7 @@ from abc import (
     ABC,
     abstractmethod,
 )
-from typing import (
-    List,
+from collections.abc import (
     Sequence,
 )
 
@@ -41,7 +40,7 @@ class IAddrBook(ABC):
         """  # noqa: E501
 
     @abstractmethod
-    def addrs(self, peer_id: ID) -> List[Multiaddr]:
+    def addrs(self, peer_id: ID) -> list[Multiaddr]:
         """
         :param peer_id: peer to get addresses of
         :return: all known (and valid) addresses for the given peer
@@ -56,7 +55,7 @@ class IAddrBook(ABC):
         """
 
     @abstractmethod
-    def peers_with_addrs(self) -> List[ID]:
+    def peers_with_addrs(self) -> list[ID]:
         """
         :return: all of the peer IDs stored with addresses
         """

libp2p/peer/peerdata.py

@@ -1,8 +1,8 @@
+from collections.abc import (
+    Sequence,
+)
 from typing import (
     Any,
-    Dict,
-    List,
-    Sequence,
 )
 
 from multiaddr import (
@@ -22,9 +22,9 @@ from .peerdata_interface import (
 class PeerData(IPeerData):
     pubkey: PublicKey
     privkey: PrivateKey
-    metadata: Dict[Any, Any]
-    protocols: List[str]
-    addrs: List[Multiaddr]
+    metadata: dict[Any, Any]
+    protocols: list[str]
+    addrs: list[Multiaddr]
 
     def __init__(self) -> None:
         self.pubkey = None
@@ -33,7 +33,7 @@ class PeerData(IPeerData):
         self.protocols = []
         self.addrs = []
 
-    def get_protocols(self) -> List[str]:
+    def get_protocols(self) -> list[str]:
         """
         :return: all protocols associated with given peer
         """
@@ -59,7 +59,7 @@ class PeerData(IPeerData):
             if addr not in self.addrs:
                 self.addrs.append(addr)
 
-    def get_addrs(self) -> List[Multiaddr]:
+    def get_addrs(self) -> list[Multiaddr]:
         """
         :return: all multiaddresses
         """

libp2p/peer/peerdata_interface.py

@@ -2,10 +2,11 @@ from abc import (
     ABC,
     abstractmethod,
 )
+from collections.abc import (
+    Sequence,
+)
 from typing import (
     Any,
-    List,
-    Sequence,
 )
 
 from multiaddr import (
@@ -24,7 +25,7 @@ from .peermetadata_interface import (
 
 class IPeerData(ABC):
     @abstractmethod
-    def get_protocols(self) -> List[str]:
+    def get_protocols(self) -> list[str]:
         """
         :return: all protocols associated with given peer
         """
@@ -48,7 +49,7 @@ class IPeerData(ABC):
         """
 
     @abstractmethod
-    def get_addrs(self) -> List[Multiaddr]:
+    def get_addrs(self) -> list[Multiaddr]:
         """
         :return: all multiaddresses
         """

libp2p/peer/peerinfo.py

@@ -1,7 +1,8 @@
+from collections.abc import (
+    Sequence,
+)
 from typing import (
     Any,
-    List,
-    Sequence,
 )
 
 import multiaddr
@@ -13,7 +14,7 @@ from .id import (
 
 class PeerInfo:
     peer_id: ID
-    addrs: List[multiaddr.Multiaddr]
+    addrs: list[multiaddr.Multiaddr]
 
     def __init__(self, peer_id: ID, addrs: Sequence[multiaddr.Multiaddr]) -> None:
         self.peer_id = peer_id

libp2p/peer/peerstore.py

@@ -1,11 +1,11 @@
 from collections import (
     defaultdict,
 )
+from collections.abc import (
+    Sequence,
+)
 from typing import (
     Any,
-    Dict,
-    List,
-    Sequence,
 )
 
 from multiaddr import (
@@ -34,7 +34,7 @@ from .peerstore_interface import (
 
 
 class PeerStore(IPeerStore):
-    peer_data_map: Dict[ID, PeerData]
+    peer_data_map: dict[ID, PeerData]
 
     def __init__(self) -> None:
         self.peer_data_map = defaultdict(PeerData)
@@ -49,7 +49,7 @@ class PeerStore(IPeerStore):
             return PeerInfo(peer_id, peer_data.get_addrs())
         raise PeerStoreError("peer ID not found")
 
-    def get_protocols(self, peer_id: ID) -> List[str]:
+    def get_protocols(self, peer_id: ID) -> list[str]:
         """
         :param peer_id: peer ID to get protocols for
         :return: protocols (as list of strings)
@@ -75,7 +75,7 @@ class PeerStore(IPeerStore):
         peer_data = self.peer_data_map[peer_id]
         peer_data.set_protocols(list(protocols))
 
-    def peer_ids(self) -> List[ID]:
+    def peer_ids(self) -> list[ID]:
         """
         :return: all of the peer IDs stored in peer store
         """
@@ -123,7 +123,7 @@ class PeerStore(IPeerStore):
         peer_data = self.peer_data_map[peer_id]
         peer_data.add_addrs(list(addrs))
 
-    def addrs(self, peer_id: ID) -> List[Multiaddr]:
+    def addrs(self, peer_id: ID) -> list[Multiaddr]:
         """
         :param peer_id: peer ID to get addrs for
         :return: list of addrs
@@ -141,12 +141,12 @@ class PeerStore(IPeerStore):
         if peer_id in self.peer_data_map:
             self.peer_data_map[peer_id].clear_addrs()
 
-    def peers_with_addrs(self) -> List[ID]:
+    def peers_with_addrs(self) -> list[ID]:
         """
         :return: all of the peer IDs which has addrs stored in peer store
         """
         # Add all peers with addrs at least 1 to output
-        output: List[ID] = []
+        output: list[ID] = []
 
         for peer_id in self.peer_data_map:
             if len(self.peer_data_map[peer_id].get_addrs()) >= 1:

libp2p/peer/peerstore_interface.py

@@ -1,10 +1,11 @@
 from abc import (
     abstractmethod,
 )
+from collections.abc import (
+    Sequence,
+)
 from typing import (
     Any,
-    List,
-    Sequence,
 )
 
 from multiaddr import (
@@ -40,7 +41,7 @@ class IPeerStore(IAddrBook, IPeerMetadata):
         """
 
     @abstractmethod
-    def get_protocols(self, peer_id: ID) -> List[str]:
+    def get_protocols(self, peer_id: ID) -> list[str]:
         """
         :param peer_id: peer ID to get protocols for
         :return: protocols (as list of strings)
@@ -62,7 +63,7 @@ class IPeerStore(IAddrBook, IPeerMetadata):
         """
 
     @abstractmethod
-    def peer_ids(self) -> List[ID]:
+    def peer_ids(self) -> list[ID]:
         """
         :return: all of the peer IDs stored in peer store
         """
@@ -101,7 +102,7 @@ class IPeerStore(IAddrBook, IPeerMetadata):
         """
 
     @abstractmethod
-    def addrs(self, peer_id: ID) -> List[Multiaddr]:
+    def addrs(self, peer_id: ID) -> list[Multiaddr]:
         """
         :param peer_id: peer ID to get addrs for
         :return: list of addrs
@@ -114,7 +115,7 @@ class IPeerStore(IAddrBook, IPeerMetadata):
         """
 
     @abstractmethod
-    def peers_with_addrs(self) -> List[ID]:
+    def peers_with_addrs(self) -> list[ID]:
         """
         :return: all of the peer IDs which has addrs stored in peer store
         """