Work 0506

.github/workflows/main.yml

@@ -18,6 +18,12 @@ on:
 
 jobs:
   check:
+    env:
+      WEB3_INFURA_PROJECT_ID: "1c91697c211f4fcd8c7361f4c4e1f55f"
+      # not sure why, but this doesn't work currently:
+      # WEB3_INFURA_PROJECT_ID: ${{ secrets.WEB3_INFURA_PROJECT_ID }}
+      # WEB3_INFURA_API_SECRET: ${{ secrets.WEB3_INFURA_API_SECRET }}
+
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
@@ -53,6 +59,11 @@ jobs:
     env:
       CB_FULLTESTS: 1
 
+      WEB3_INFURA_PROJECT_ID: "1c91697c211f4fcd8c7361f4c4e1f55f"
+      # not sure why, but this doesn't work currently:
+      # WEB3_INFURA_PROJECT_ID: ${{ secrets.WEB3_INFURA_PROJECT_ID }}
+      # WEB3_INFURA_API_SECRET: ${{ secrets.WEB3_INFURA_API_SECRET }}
+
     # Test on Ubuntu, MacOS, Windows using CPython and PyPy
     runs-on: ${{ matrix.os }}
     strategy:
@@ -101,11 +112,19 @@ jobs:
       run: |
         pip install .[all]
 
-    - name: Run unit tests (PyTest)
+    - name: Prechecks
       run: |
         python -c "import autobahn; print(autobahn.__version__)"
         python -c "from autobahn import xbr; print(xbr.HAS_XBR)"
         python -c "from autobahn.testutil import FakeTransport; print(FakeTransport)"
+        python -c "import os; print('WEB3_INFURA_PROJECT_ID', len(os.environ.get('WEB3_INFURA_PROJECT_ID', '')))"
+        python -c "import os; print('WEB3_INFURA_API_SECRET', len(os.environ.get('WEB3_INFURA_API_SECRET', '')))"
+
+    # does not work on py3.10
+    # python -c "from web3.auto.infura import w3; print(w3.isConnected())"
+
+    - name: Run unit tests (PyTest)
+      run: |
         tox -c tox.ini -e ${{ matrix.framework }}
 
   docs:

.gitignore

@@ -46,3 +46,5 @@ autobahn/xbr/contracts
 .wheels
 get-pip.py
 docs/autoapi/
+key.pub
+key.priv

Makefile

@@ -128,6 +128,12 @@ upload_exe:
 	aws cloudfront create-invalidation \
 		--distribution-id E2QIG9LNGCJSP9 --paths "/xbrnetwork/linux-amd64/*"
 
+# WEB3_INFURA_PROJECT_ID must be defined for this
+test_infura:
+	time -f "%e" python -c "from web3.auto.infura import w3; print(w3.isConnected())"
+
+test_xbr:
+	USE_TWISTED=1 trial autobahn.xbr
 
 test_xbr_cli:
 	xbrnetwork
@@ -178,6 +184,9 @@ test_rng:
 test_serializer:
 	USE_TWISTED=1 trial autobahn.wamp.test.test_wamp_serializer
 
+test_wamp_identifiers:
+	USE_TWISTED=1 trial autobahn.wamp.test.test_wamp_identifiers
+
 test_tx_cryptobox:
 	USE_TWISTED=1 trial autobahn.wamp.test.test_cryptobox
 
@@ -189,6 +198,14 @@ test_cryptosign:
 	USE_ASYNCIO=1 pytest -s -v -rfA --ignore=./autobahn/twisted autobahn/wamp/test/test_wamp_cryptosign.py
 	USE_TWISTED=1 trial autobahn.wamp.test.test_wamp_cryptosign
 
+test_xbr_web3:
+#	pytest -s -v -rfA autobahn/xbr/test/test_xbr_web3.py
+	trial autobahn/xbr/test/test_xbr_web3.py
+
+test_xbr_frealm:
+#	pytest -s -v -rfA autobahn/xbr/test/test_xbr_frealm.py
+	trial autobahn/xbr/test/test_xbr_frealm.py
+
 test_wamp_scram:
 	USE_ASYNCIO=1 trial autobahn.wamp.test.test_wamp_scram
 	USE_TWISTED=1 trial autobahn.wamp.test.test_wamp_scram

autobahn/_version.py

@@ -24,6 +24,6 @@
 #
 ###############################################################################
 
-__version__ = '22.4.2'
+__version__ = '22.5.1.dev1'
 
 __build__ = '00000000-0000000'

autobahn/twisted/component.py

@@ -26,6 +26,7 @@
 
 
 from functools import wraps
+from typing import List
 
 from twisted.internet.interfaces import IStreamClientEndpoint
 from twisted.internet.endpoints import UNIXClientEndpoint
@@ -334,7 +335,7 @@ def start(self, reactor=None):
         return self._start(loop=reactor)
 
 
-def run(components, log_level='info'):
+def run(components: List[Component], log_level: str = 'info', stop_at_close: bool = True):
     """
     High-level API to run a series of components.
 
@@ -347,10 +348,8 @@ def run(components, log_level='info'):
     each component yourself.
 
     :param components: the Component(s) you wish to run
-    :type components: instance or list of :class:`autobahn.twisted.component.Component`
-
     :param log_level: a valid log-level (or None to avoid calling start_logging)
-    :type log_level: string
+    :param stop_at_close: Flag to control whether to stop the reactor when done.
     """
     # only for Twisted > 12
     # ...so this isn't in all Twisted versions we test against -- need
@@ -366,12 +365,16 @@ def run(components, log_level='info'):
 
     log = txaio.make_logger()
 
-    def done_callback(reactor, arg):
-        if isinstance(arg, Failure):
-            log.error("Something went wrong: {log_failure}", failure=arg)
-        try:
-            reactor.stop()
-        except ReactorNotRunning:
-            pass
+    if stop_at_close:
+        def done_callback(reactor, arg):
+            if isinstance(arg, Failure):
+                log.error('Something went wrong: {log_failure}', failure=arg)
+                try:
+                    log.warn('Stopping reactor ..')
+                    reactor.stop()
+                except ReactorNotRunning:
+                    pass
+    else:
+        done_callback = None
 
     react(component._run, (components, done_callback))

autobahn/twisted/test/test_tx_component.py

@@ -394,7 +394,7 @@ def test_invalid_type(self):
                         "foo"
                     ]
                 )
-            self.assertIn("must be a dict", str(ctx.exception))
+            self.assertIn("invalid WebSocket URL", str(ctx.exception))
 
         def test_no_url(self):
             with self.assertRaises(ValueError) as ctx: