Adapt code to match secret_handshake changes

examples/test_client.py

@@ -5,8 +5,9 @@ from asyncio import get_event_loop, gather, ensure_future
 
 from colorlog import ColoredFormatter
 
+from secret_handshake.network import SHSClient
 from ssb.muxrpc import MuxRPCAPI, MuxRPCAPIException
-from ssb.packet_stream import PSClient, PSMessageType
+from ssb.packet_stream import PacketStream, PSMessageType
 from ssb.util import load_ssb_secret
 
 
@@ -52,13 +53,15 @@ async def test_client():
                 f.write(data.data)
 
 
-async def _main(packet_stream):
-    await packet_stream.connect()
+async def main():
+    client = SHSClient('127.0.0.1', 8008, keypair, bytes(keypair.verify_key))
+    packet_stream = PacketStream(client)
+    await client.open()
     api.add_connection(packet_stream)
     await gather(ensure_future(api), test_client())
 
 
-def main():
+if __name__ == '__main__':
     # create console handler and set level to debug
     ch = logging.StreamHandler()
     ch.setLevel(logging.INFO)
@@ -78,10 +81,5 @@ def main():
     keypair = load_ssb_secret()['keypair']
 
     loop = get_event_loop()
-    packet_stream = PSClient('127.0.0.1', 8008, keypair, bytes(keypair.verify_key), loop=loop)
-    loop.run_until_complete(_main(packet_stream))
+    loop.run_until_complete(main())
     loop.close()
-
-
-if __name__ == '__main__':
-    main()

examples/test_server.py

@@ -1,37 +1,47 @@
 import logging
-from asyncio import get_event_loop, ensure_future
+from asyncio import gather, get_event_loop, ensure_future
 
 from colorlog import ColoredFormatter
 
-from ssb.packet_stream import PSServer
+from secret_handshake import SHSServer
+from ssb.packet_stream import PacketStream
+from ssb.protocol.streams import stream_api
 from ssb.util import load_ssb_secret
 
 
-async def on_connect():
-    ensure_future(packet_stream, loop=loop)
+async def on_connect(conn):
+    packet_stream = PacketStream(conn)
+    stream_api.add_connection(packet_stream)
 
-# create console handler and set level to debug
-ch = logging.StreamHandler()
-ch.setLevel(logging.DEBUG)
-
-# create formatter
-formatter = ColoredFormatter('%(log_color)s%(levelname)s%(reset)s:%(bold_white)s%(name)s%(reset)s - '
-                             '%(cyan)s%(message)s%(reset)s')
-
-# add formatter to ch
-ch.setFormatter(formatter)
-
-# add ch to logger
-logger = logging.getLogger('packet_stream')
-logger.setLevel(logging.DEBUG)
-logger.addHandler(ch)
+    print('connect', conn)
+    async for msg in packet_stream:
+        print(msg)
 
 
-loop = get_event_loop()
+async def main():
+    server = SHSServer('127.0.0.1', 8008, load_ssb_secret()['keypair'])
+    server.on_connect(on_connect)
+    await server.listen()
 
-packet_stream = PSServer('127.0.0.1', 8008, load_ssb_secret()['keypair'], loop=loop)
-packet_stream.on_connect(on_connect)
-packet_stream.listen()
 
-loop.run_forever()
-loop.close()
+if __name__ == '__main__':
+    # create console handler and set level to debug
+    ch = logging.StreamHandler()
+    ch.setLevel(logging.DEBUG)
+
+    # create formatter
+    formatter = ColoredFormatter('%(log_color)s%(levelname)s%(reset)s:%(bold_white)s%(name)s%(reset)s - '
+                                 '%(cyan)s%(message)s%(reset)s')
+
+    # add formatter to ch
+    ch.setFormatter(formatter)
+
+    # add ch to logger
+    logger = logging.getLogger('packet_stream')
+    logger.setLevel(logging.DEBUG)
+    logger.addHandler(ch)
+
+    loop = get_event_loop()
+    loop.run_until_complete(main())
+    loop.run_forever()
+    loop.close()