fix: conn upgrade detection

n0-computer · Aug 28, 2023 · 1e29b44 · 1e29b44
1 parent 494d502
commit 1e29b44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/netsim/main.py b/netsim/main.py
@@ -59,7 +59,7 @@ def run(nodes, prefix, args, debug=False, full_debug=False, visualize=False):
     if debug:
         # reduce logging, track only those of interest
         # magicsock::endpoint required for iroh integration tests
-        env_vars['RUST_LOG'] = 'error,iroh_net::hp::magicsock::endpoint=debug'
+        env_vars['RUST_LOG'] = 'error,iroh_net::magicsock::endpoint=debug'
         if full_debug:
             env_vars['RUST_LOG'] = 'debug'
 

diff --git a/netsim/netsim_parser.py b/netsim/netsim_parser.py
@@ -198,7 +198,7 @@ def parse_magic_iroh_client(lines):
             is_ok += 1
         if 'Transferred' in line and 'seconds' in line:
             is_ok += 1
-        if 'sending UDP: Some(' in line and 'DERP: None' in line:
+        if 'sending UDP: Some(' in line and 'DERP:' in line:
             s['conn_upgrade'] = 'true'
     s['transfer_success'] = 'true' if is_ok == 2 else 'false'
     return s