File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -490,11 +490,11 @@ def onResponseTraceRoute(self, p: dict):
490
490
asDict = google .protobuf .json_format .MessageToDict (routeDiscovery )
491
491
492
492
print ("Route traced:" )
493
- routeStr = self ._nodeNumToId (p ["to" ])
493
+ routeStr = self ._nodeNumToId (p ["to" ]) or f" { p [ 'to' ]:08x } "
494
494
if "route" in asDict :
495
495
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 } " )
498
498
print (routeStr )
499
499
500
500
self ._acknowledgment .receivedTraceRoute = True
@@ -1021,7 +1021,7 @@ def _fixupPosition(self, position: Dict) -> Dict:
1021
1021
position ["longitude" ] = float (position ["longitudeI" ] * Decimal ("1e-7" ))
1022
1022
return position
1023
1023
1024
- def _nodeNumToId (self , num ) :
1024
+ def _nodeNumToId (self , num : int ) -> Optional [ str ] :
1025
1025
"""Map a node node number to a node ID
1026
1026
1027
1027
Arguments:
@@ -1034,7 +1034,7 @@ def _nodeNumToId(self, num):
1034
1034
return BROADCAST_ADDR
1035
1035
1036
1036
try :
1037
- return self .nodesByNum [num ]["user" ]["id" ]
1037
+ return self .nodesByNum [num ]["user" ]["id" ] #type: ignore[index]
1038
1038
except :
1039
1039
logging .debug (f"Node { num } not found for fromId" )
1040
1040
return None
You can’t perform that action at this time.
0 commit comments