Merge #645: jade: update jade simulator port in line with current jad…

…e master branch

10f81db jade: update jade simulator port in line with current jade master branch (Jamie C. Driver)

Pull request description:

  The Jade simulator tcp port has been changed from 2222 to 30121 to avoid port conflicts.  This change updates the client to use that updated port.

  In response to #628

ACKs for top commit:
  achow101:
    ACK 10f81db

Tree-SHA512: ac4d37e46c852c547a5904504e030a2d2d0950b3c4e5306b1a051cc74b581b04703501ad7bc08eae85eb29047164fb1c183ee5a6934ca73a6821629d0c9fd72f

hwilib/devices/jade.py

@@ -56,7 +56,7 @@
 import os
 
 # The test emulator port
-SIMULATOR_PATH = 'tcp:127.0.0.1:2222'
+SIMULATOR_PATH = 'tcp:127.0.0.1:30121'
 
 JADE_DEVICE_IDS = [(0x10c4, 0xea60), (0x1a86, 0x55d4)]
 HAS_NETWORKING = hasattr(jade, '_http_request')

test/test_jade.py

@@ -24,7 +24,7 @@
 from hwilib.devices.jadepy.jade import JadeAPI
 
 USE_SIMULATOR = True
-JADE_PATH = 'tcp:127.0.0.1:2222' if USE_SIMULATOR else '/dev/ttyUSB0'
+JADE_PATH = 'tcp:127.0.0.1:30121' if USE_SIMULATOR else '/dev/ttyUSB0'
 TEST_SEED = bytes.fromhex('b90e532426d0dc20fffe01037048c018e940300038b165c211915c672e07762c')
 
 LOGGING = None  # logging.INFO
@@ -66,7 +66,7 @@ def start(self):
                     '-machine', 'esp32',
                     '-m', '4M',
                     '-drive', 'file=flash_image.bin,if=mtd,format=raw',
-                    '-nic', 'user,model=open_eth,id=lo0,hostfwd=tcp:0.0.0.0:2222-:2222',
+                    '-nic', 'user,model=open_eth,id=lo0,hostfwd=tcp:0.0.0.0:30121-:30121',
                     '-drive', 'file=qemu_efuse.bin,if=none,format=raw,id=efuse',
                     '-global', 'driver=nvram.esp32.efuse,property=drive,value=efuse',
                     '-serial', 'pty'