Merge branch 'talaia-labs:master' into lightning-msgs

talaia-labs · Nov 20, 2022 · e34bb53 · e34bb53
2 parents f42085a + 409eea8
commit e34bb53
Show file tree

Hide file tree

Showing 40 changed files with 6,351 additions and 1,169 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Rust ${{ matrix.toolchain }} toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install Rust stable toolchain
         uses: actions-rs/toolchain@v1
         with:

diff --git a/.github/workflows/cln-plugin.yaml b/.github/workflows/cln-plugin.yaml
@@ -10,8 +10,11 @@ jobs:
   cache-cln:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+          check-latest: true
       - name: Create CLN cache
         id: cache-cln
         uses: actions/cache@v3
@@ -21,6 +24,8 @@ jobs:
           path: lightning
           key: ${{ runner.os }}-build-${{ env.cache-name }}-v${{ env.cln_version }}
       - name: Compile CLN
+        env: 
+          PYTHON_KEYRING_BACKEND: keyring.backends.null.Keyring
         if: ${{ steps.cache-cln.outputs.cache-hit != 'true' }}
         run: |
           sudo apt-get update && sudo apt-get install gettext
@@ -32,8 +37,11 @@ jobs:
     needs: cache-cln
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+          check-latest: true
       - name: Install bitcoind
         run: |
           wget https://bitcoincore.org/bin/bitcoin-core-${{ env.bitcoind_version }}/bitcoin-${{ env.bitcoind_version }}-x86_64-linux-gnu.tar.gz
@@ -52,13 +60,13 @@ jobs:
           cd lightning && sudo make install
       - name: Install teos and the plugin
         run: |
-          cargo install --path teos 
-          cargo install --path watchtower-plugin
+          cargo install --locked --path teos 
+          cargo install --locked --path watchtower-plugin
       - name: Add test dependencies
         run: |
           cd watchtower-plugin/tests
           pip install --user poetry && poetry install
       - name: Run tests
         run: |
           cd watchtower-plugin/tests
-          DEVELOPER=1 SLOW_MACHINE=1 poetry run pytest test.py -s
+          DEVELOPER=1 SLOW_MACHINE=1 poetry run pytest test.py --log-cli-level=INFO -s
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 target
 __pycache__
-Cargo.lock
 .vscode
 .idea