File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -490,11 +490,11 @@ def onResponseTraceRoute(self, p: dict):
490490 asDict = google .protobuf .json_format .MessageToDict (routeDiscovery )
491491
492492 print ("Route traced:" )
493- routeStr = self ._nodeNumToId (p ["to" ])
493+ routeStr = self ._nodeNumToId (p ["to" ]) or f" { p [ 'to' ]:08x } "
494494 if "route" in asDict :
495495 for nodeNum in asDict ["route" ]:
496- routeStr += " --> " + self ._nodeNumToId (nodeNum )
497- routeStr += " --> " + self ._nodeNumToId (p ["from" ])
496+ routeStr += " --> " + ( self ._nodeNumToId (nodeNum ) or f" { nodeNum :08x } " )
497+ routeStr += " --> " + ( self ._nodeNumToId (p ["from" ]) or f" { p [ 'from' ]:08x } " )
498498 print (routeStr )
499499
500500 self ._acknowledgment .receivedTraceRoute = True
@@ -1021,7 +1021,7 @@ def _fixupPosition(self, position: Dict) -> Dict:
10211021 position ["longitude" ] = float (position ["longitudeI" ] * Decimal ("1e-7" ))
10221022 return position
10231023
1024- def _nodeNumToId (self , num ) :
1024+ def _nodeNumToId (self , num : int ) -> Optional [ str ] :
10251025 """Map a node node number to a node ID
10261026
10271027 Arguments:
@@ -1034,7 +1034,7 @@ def _nodeNumToId(self, num):
10341034 return BROADCAST_ADDR
10351035
10361036 try :
1037- return self .nodesByNum [num ]["user" ]["id" ]
1037+ return self .nodesByNum [num ]["user" ]["id" ] #type: ignore[index]
10381038 except :
10391039 logging .debug (f"Node { num } not found for fromId" )
10401040 return None
You can’t perform that action at this time.
0 commit comments