Merge branch 'main' of github.com:lnbits/lnbits-legend

.github/workflows/regtest.yml

@@ -19,17 +19,11 @@ jobs:
           docker build -t lnbits-legend .
           git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
           cd docker
-          source docker-scripts.sh
-          lnbits-regtest-start
-          echo "sleeping 60 seconds"
-          sleep 60
-          echo "continue"
-          lnbits-regtest-init
-          bitcoin-cli-sim -generate 1
-          lncli-sim 1 listpeers
+          chmod +x ./tests
+          ./tests
           sudo chmod -R a+rwx .
       - name: Install dependencies
-        env: 
+        env:
           VIRTUAL_ENV: ./venv
           PATH: ${{ env.VIRTUAL_ENV }}/bin:${{ env.PATH }}
         run: |
@@ -37,7 +31,7 @@ jobs:
           ./venv/bin/python -m pip install --upgrade pip
           ./venv/bin/pip install -r requirements.txt
           ./venv/bin/pip install pylightning
-          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock      
+          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock
       - name: Run tests
         env:
           PYTHONUNBUFFERED: 1
@@ -66,17 +60,11 @@ jobs:
           docker build -t lnbits-legend .
           git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
           cd docker
-          source docker-scripts.sh
-          lnbits-regtest-start
-          echo "sleeping 60 seconds"
-          sleep 60
-          echo "continue"
-          lnbits-regtest-init
-          bitcoin-cli-sim -generate 1
-          lncli-sim 1 listpeers
+          chmod +x ./tests
+          ./tests
           sudo chmod -R a+rwx .
       - name: Install dependencies
-        env: 
+        env:
           VIRTUAL_ENV: ./venv
           PATH: ${{ env.VIRTUAL_ENV }}/bin:${{ env.PATH }}
         run: |
@@ -84,7 +72,7 @@ jobs:
           ./venv/bin/python -m pip install --upgrade pip
           ./venv/bin/pip install -r requirements.txt
           ./venv/bin/pip install pylightning
-          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock      
+          ./venv/bin/pip install pytest pytest-asyncio pytest-cov requests mock
       - name: Run tests
         env:
           PYTHONUNBUFFERED: 1
@@ -94,4 +82,4 @@ jobs:
           CLIGHTNING_RPC: docker/data/clightning-1/regtest/lightning-rpc
         run: |
           sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
-          make test-real-wallet
+          make test-real-wallet