From d76d0f6591d3fdb6635ec3eb2b1b89a42bcc4ea5 Mon Sep 17 00:00:00 2001
From: Bastien Teinturier <31281497+t-bast@users.noreply.github.com>
Date: Thu, 29 Dec 2022 10:22:10 +0100
Subject: [PATCH] Fix build (#2543)

Fix the tests on `master` and update github actions.
---
 .github/workflows/latest-bitcoind.yml                    | 7 ++++---
 .github/workflows/main.yml                               | 9 +++++----
 .../src/test/scala/fr/acinq/eclair/EclairImplSpec.scala  | 4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/latest-bitcoind.yml b/.github/workflows/latest-bitcoind.yml
index c768af0f6..078d5ee97 100644
--- a/.github/workflows/latest-bitcoind.yml
+++ b/.github/workflows/latest-bitcoind.yml
@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 90
     steps:
       - name: Checkout bitcoind master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: bitcoin/bitcoin
           path: bitcoin
@@ -37,14 +37,15 @@ jobs:
         working-directory: ./bitcoin
 
       - name: Checkout eclair master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: eclair
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'adopt'
 
       - name: Configure OS settings
         run: echo "fs.file-max = 1024000" | sudo tee -a /etc/sysctl.conf
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1191b2962..0c556c624 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,15 +13,16 @@ jobs:
     timeout-minutes: 30
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
         java-version: 11
+        distribution: 'adopt'
       
     - name: Cache Maven dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -36,4 +37,4 @@ jobs:
       run: mvn test-compile && mvn scoverage:report -DtagsToExclude=external-api
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/EclairImplSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/EclairImplSpec.scala
index 9b02162e1..dcb79fff9 100644
--- a/eclair-core/src/test/scala/fr/acinq/eclair/EclairImplSpec.scala
+++ b/eclair-core/src/test/scala/fr/acinq/eclair/EclairImplSpec.scala
@@ -344,7 +344,7 @@ class EclairImplSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with I
 
     eclair.findRoute(c, 250_000 msat, None)
     val routeRequest1 = router.expectMsgType[RouteRequest]
-    assert(routeRequest1.target == c)
+    assert(routeRequest1.target.nodeId == c)
     assert(routeRequest1.ignore == Router.Ignore.empty)
 
     val unknownNodeId = randomKey().publicKey
@@ -353,7 +353,7 @@ class EclairImplSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with I
     router.expectMsg(Router.GetRouterData)
     router.reply(routerData)
     val routeRequest2 = router.expectMsgType[RouteRequest]
-    assert(routeRequest2.target == c)
+    assert(routeRequest2.target.nodeId == c)
     assert(routeRequest2.ignore.nodes == Set(b, unknownNodeId))
     assert(routeRequest2.ignore.channels == Set(
       Router.ChannelDesc(channel1.shortChannelId, a, b),