From 5e4c6dd6497012d47da03b6971273394e62c051a Mon Sep 17 00:00:00 2001 From: ariskk Date: Sat, 6 Feb 2021 13:51:12 +0000 Subject: [PATCH] Fix typo in ElectrumClientPool --- .../acinq/eclair/blockchain/electrum/ElectrumClientPool.scala | 4 ++-- .../eclair/blockchain/electrum/ElectrumClientPoolSpec.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/electrum/ElectrumClientPool.scala b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/electrum/ElectrumClientPool.scala index 042b1abbde..d2d26cfa05 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/electrum/ElectrumClientPool.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/electrum/ElectrumClientPool.scala @@ -179,7 +179,7 @@ object ElectrumClientPool { val MAX_CONNECTION_COUNT = 3 - case class ElectrumServerAddress(adress: InetSocketAddress, ssl: SSL) + case class ElectrumServerAddress(address: InetSocketAddress, ssl: SSL) /** * Parses default electrum server list and extract addresses @@ -222,7 +222,7 @@ object ElectrumClientPool { * @return a random address that we're not connected to yet */ def pickAddress(serverAddresses: Set[ElectrumServerAddress], usedAddresses: Set[InetSocketAddress]): Option[ElectrumServerAddress] = { - Random.shuffle(serverAddresses.filterNot(a => usedAddresses.contains(a.adress)).toSeq).headOption + Random.shuffle(serverAddresses.filterNot(a => usedAddresses.contains(a.address)).toSeq).headOption } // @formatter:off diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/electrum/ElectrumClientPoolSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/electrum/ElectrumClientPoolSpec.scala index 0f63f190cb..6e9c85a697 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/electrum/ElectrumClientPoolSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/electrum/ElectrumClientPoolSpec.scala @@ -50,10 +50,10 @@ class ElectrumClientPoolSpec extends TestKitBaseClass with AnyFunSuiteLike with import concurrent.ExecutionContext.Implicits.global test("pick a random, unused server address") { - val usedAddresses = Random.shuffle(serverAddresses.toSeq).take(serverAddresses.size / 2).map(_.adress).toSet + val usedAddresses = Random.shuffle(serverAddresses.toSeq).take(serverAddresses.size / 2).map(_.address).toSet for (_ <- 1 to 10) { val Some(pick) = ElectrumClientPool.pickAddress(serverAddresses, usedAddresses) - assert(!usedAddresses.contains(pick.adress)) + assert(!usedAddresses.contains(pick.address)) } }